Permalink
Browse files

Merge branch 'master' of git@github.com:Wickth/TerrainControl.git

Conflicts:
	bukkit/src/com/khorn/terraincontrol/bukkit/BukkitWorld.java
	common/src/com/khorn/terraincontrol/LocalWorld.java
	common/src/com/khorn/terraincontrol/biomelayers/layers/LayerBiomeBorder.java
	common/src/com/khorn/terraincontrol/configuration/BiomeConfig.java
	common/src/com/khorn/terraincontrol/configuration/WorldConfig.java
  • Loading branch information...
2 parents fd3bc3c + 2d8cbb1 commit c13a4151002746002150fe031c64fc5cff22c9e9 @Wickth Wickth committed Mar 25, 2012
Showing with 0 additions and 0 deletions.

0 comments on commit c13a415

Please sign in to comment.