summaryrefslogtreecommitdiffstats
path: root/src/World.h (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merged master into redstonefixesTiger Wang2013-11-271-1/+5
|
* Merge remote-tracking branch 'origin/master' into foldermove2Alexander Harkness2013-11-261-0/+3
| | | | | Conflicts: VC2008/MCServer.vcproj
* Merge remote-tracking branch 'origin/master' into foldermove2Alexander Harkness2013-11-241-2/+8
| | | | | Conflicts: GNUmakefile
* Moved source to srcAlexander Harkness2013-11-241-0/+744