Commit graph

6 commits

Author SHA1 Message Date
Luke Rogers
df894932d2 Merge branch 'develop' into refresh
Conflicts:
	plugins/util/timeformat.py
2013-12-12 12:41:02 +13:00
Luke Rogers
aa8ab33ccb Merge branch 'develop' into refresh
Conflicts:
	core/config.py
	plugins/util/color.py
	plugins/util/formatting.py
2013-11-27 16:55:04 +13:00
Luke Rogers
f49c1b873c prototype 2013-11-10 13:23:29 +13:00
Luke Rogers
19cd24f07f renamed a few things 2013-10-08 11:44:14 +13:00
Luke Rogers
07af40215b removed these for now 2013-10-03 22:18:04 +13:00
Luke Rogers
7dc1daa69f move lib to core, no more sys.path fucking @cybojenix 2013-10-02 12:01:46 +13:00