Spp 1f162fb7c0 Fix some merge problems

2012-08-22 10:42:05 +02:00

..

authserver

Merge remote-tracking branch 'origin/master' into 4.3.4

2012-08-21 23:40:38 +01:00

collision

Core/Misc: Some fixes here and there

2012-08-20 11:05:50 +02:00

game

Fix some merge problems

2012-08-22 10:42:05 +02:00

scripts

Merge remote-tracking branch 'origin/master' into 4.3.4

2012-08-21 23:40:38 +01:00

shared

Core/Loading: Fixed a crash at char login

2012-08-18 18:51:59 -05:00

worldserver

Merge remote-tracking branch 'origin/master' into 4.3.4

2012-08-21 23:40:38 +01:00

CMakeLists.txt

CMake: Updated year to 2012.

2012-01-07 23:10:50 +01:00