Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into PerWorldThreads. | madmaxoft | 2013-08-13 | 1 | -2/+4 |
| | | | | Also fixed the AllToLua script not resolving conflicts. | ||||
* | AllToLua now resets the git status for the files. | madmaxoft | 2013-08-02 | 1 | -0/+22 |
| | | | | | This should auto-fix merge conflicts when they occur on the Bindings.cpp / Bindings.h files. http://forum.mc-server.org/showthread.php?tid=1200&pid=9315#pid9315 | ||||
* | Changed everyting to Unix line endings. | Alexander Harkness | 2013-07-29 | 1 | -3/+3 |
| | |||||
* | Nightbuild: bindings are automatically update before the build | madmaxoft@gmail.com | 2012-06-07 | 1 | -2/+2 |
| | | | | git-svn-id: http://mc-server.googlecode.com/svn/trunk@572 0a769ca7-a7f5-676a-18bf-c427514a06d6 | ||||
* | MCServer c++ source files | faketruth | 2011-10-03 | 1 | -0/+3 |
git-svn-id: http://mc-server.googlecode.com/svn/trunk@3 0a769ca7-a7f5-676a-18bf-c427514a06d6 |