Vincent_Michael 71eaceae5d Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 ...

Conflicts:
	src/server/game/Entities/Vehicle/Vehicle.cpp
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Spells/SpellMgr.cpp
	src/server/game/Weather/Weather.h
	src/server/shared/Database/Implementation/WorldDatabase.cpp
	src/tools/CMakeLists.txt

2013-02-18 18:51:52 +01:00

..

Implementation

Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4

2013-02-18 18:51:52 +01:00

AdhocStatement.cpp

Update copyright note for 2013.

2013-01-01 00:41:01 +01:00

AdhocStatement.h

Update copyright note for 2013.

2013-01-01 00:41:01 +01:00

DatabaseEnv.h

Update copyright note for 2013.

2013-01-01 00:41:01 +01:00

DatabaseWorker.cpp

Update copyright note for 2013.

2013-01-01 00:41:01 +01:00

DatabaseWorker.h

Update copyright note for 2013.

2013-01-01 00:41:01 +01:00

DatabaseWorkerPool.h

Core/DBLayer: Avoid a crash when calling mysql_get_server_version if connection was not open

2013-02-08 23:06:25 +00:00

Field.cpp

Update copyright note for 2013.

2013-01-01 00:41:01 +01:00

Field.h

Core/Mysql: Multiple changes

2013-01-02 12:22:50 +01:00

MySQLConnection.cpp

Core/Mysql: Multiple changes

2013-01-02 12:22:50 +01:00

MySQLConnection.h

Core/Mysql: Multiple changes

2013-01-02 12:22:50 +01:00

MySQLThreading.h

Update copyright note for 2013.

2013-01-01 00:41:01 +01:00

PreparedStatement.cpp

Core/Misc: Removed odd code from CreatureAIImpl.h, it does not belong here

2013-01-02 14:20:20 +01:00

PreparedStatement.h

Core/Misc: Removed odd code from CreatureAIImpl.h, it does not belong here

2013-01-02 14:20:20 +01:00

QueryHolder.cpp

Update copyright note for 2013.

2013-01-01 00:41:01 +01:00

QueryHolder.h

Update copyright note for 2013.

2013-01-01 00:41:01 +01:00

QueryResult.cpp

Update copyright note for 2013.

2013-01-01 00:41:01 +01:00

QueryResult.h

Update copyright note for 2013.

2013-01-01 00:41:01 +01:00

SQLOperation.h

Update copyright note for 2013.

2013-01-01 00:41:01 +01:00

Transaction.cpp

Update copyright note for 2013.

2013-01-01 00:41:01 +01:00

Transaction.h

Core/Mysql: Multiple changes

2013-01-02 12:22:50 +01:00