Nay 11652278df Merge remote-tracking branch 'origin/master' into 4.3.4 ...

Conflicts:
	src/tools/vmap4_extractor/vmapexport.cpp

2012-08-20 16:08:27 +01:00

..

auth

SQL: Correct SQL errors in an auth update file and character_database.sql (thanks Sinzia/Bio)

2012-08-08 18:53:08 +01:00

characters

DB: Rename characters' void_storage to character_void_storage

2012-08-08 03:42:48 +01:00

world

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

2012-08-20 16:08:27 +01:00