Commit Graph

2 Commits

Author SHA1 Message Date
Jason Booth
fe0c6556ed Merge branch 'master' of git://github.com/FrozenCow/dynmap
Conflicts:
	colorschemes/ovocean.txt
	src/main/java/org/dynmap/MapManager.java
2011-03-07 13:39:58 -06:00
FrozenCow
090f417f32 Added ability to specify colorschemes per map/renderer. 2011-03-05 18:38:17 +01:00