summaryrefslogtreecommitdiffstats
path: root/src/Root.cpp (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of https://github.com/mc-server/MCServer into fixesnfeaturesTiger Wang2013-12-081-1/+1
|\ | | | | | | | | | | | | Conflicts: src/Bindings/Bindings.cpp src/Bindings/Bindings.h src/Blocks/BlockHandler.cpp
| * Moved bindings-related to a Bindings subfolder.madmaxoft2013-12-081-1/+1
| | | | | | | | Ref.: #407
* | Console trims its commands before executing 'emTiger Wang2013-12-071-3/+3
|/
* DeadlockDetect is configurable now.madmaxoft2013-11-301-4/+7
| | | | This is needed when debugging Lua plugins.
* Fixed some of tiger's derpyness.Alexander Harkness2013-11-271-1/+1
|
* Hopefully fixed last of the Linux compile errorsTiger Wang2013-11-261-1/+1
|
* Attempt to fix compilationTiger Wang2013-11-241-1/+1
|
* Merge remote-tracking branch 'origin/master' into foldermove2Alexander Harkness2013-11-241-0/+10
| | | | | Conflicts: GNUmakefile
* Moved source to srcAlexander Harkness2013-11-241-0/+744