madmaxoft
|
af645c62c9
|
Merge branch 'master' into PerWorldThreads.
Also fixed the AllToLua script not resolving conflicts.
|
2013-08-13 23:02:22 +02:00 |
|
madmaxoft
|
13c5a7864e
|
AllToLua now resets the git status for the files.
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
|
2013-08-02 09:25:12 +02:00 |
|
Alexander Harkness
|
53e22b1185
|
Changed everyting to Unix line endings.
|
2013-07-29 12:13:03 +01:00 |
|
madmaxoft@gmail.com
|
f8167f3577
|
Nightbuild: bindings are automatically update before the build
git-svn-id: http://mc-server.googlecode.com/svn/trunk@572 0a769ca7-a7f5-676a-18bf-c427514a06d6
|
2012-06-07 20:30:29 +00:00 |
|
faketruth
|
386d58b586
|
MCServer c++ source files
git-svn-id: http://mc-server.googlecode.com/svn/trunk@3 0a769ca7-a7f5-676a-18bf-c427514a06d6
|
2011-10-03 18:41:19 +00:00 |
|