biglad
08-09-2009, 06:59 AM
merge
src/game/World.h (http://bitbucket.org/Azrael/mgacore2/src/8efdef342d1d/src/game/World.h) (3 lines added, 4 lines removed)
src/game/World.cpp (http://bitbucket.org/Azrael/mgacore2/src/8efdef342d1d/src/game/World.cpp) (0 lines added, 53 lines removed)
src/trinitycore/trinitycore.conf.dist (http://bitbucket.org/Azrael/mgacore2/src/8efdef342d1d/src/trinitycore/trinitycore.conf.dist) (0 lines added, 22 lines removed)
More... (http://bitbucket.org/Azrael/mgacore2/changeset/8efdef342d1d/)
src/game/World.h (http://bitbucket.org/Azrael/mgacore2/src/8efdef342d1d/src/game/World.h) (3 lines added, 4 lines removed)
src/game/World.cpp (http://bitbucket.org/Azrael/mgacore2/src/8efdef342d1d/src/game/World.cpp) (0 lines added, 53 lines removed)
src/trinitycore/trinitycore.conf.dist (http://bitbucket.org/Azrael/mgacore2/src/8efdef342d1d/src/trinitycore/trinitycore.conf.dist) (0 lines added, 22 lines removed)
More... (http://bitbucket.org/Azrael/mgacore2/changeset/8efdef342d1d/)