Nay 874ddcb0ae Merge remote-tracking branch 'origin/master' into 4.3.4 ...

Conflicts:
	dep/PackageList.txt
	src/tools/map_extractor/System.cpp

2012-09-03 16:11:46 +01:00

..

authserver

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

2012-09-01 22:19:13 +01:00

collision

Core: Fix many "errors"/warnings and coding style (1)

2012-08-30 19:07:59 +01:00

game

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

2012-09-03 16:11:46 +01:00

scripts

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

2012-09-03 16:11:46 +01:00

shared

Fixed typo in PutBits

2012-09-02 14:22:18 +02:00

worldserver

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

2012-09-01 22:19:13 +01:00

CMakeLists.txt

CMake: Updated year to 2012.

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