kaelima 0a88787dfc Merge git://github.com/TrinityCore/TrinityCore into mmaps ...

Conflicts:
	src/server/game/Entities/Vehicle/Vehicle.cpp
	src/server/game/Movement/MovementGenerator.h
	src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.cpp
	src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.h
	src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.cpp
	src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.h
	src/server/game/Movement/MovementGenerators/IdleMovementGenerator.cpp
	src/server/game/Movement/MovementGenerators/IdleMovementGenerator.h
	src/server/game/Movement/MovementGenerators/PointMovementGenerator.cpp
	src/server/game/Movement/MovementGenerators/PointMovementGenerator.h
	src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp
	src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.h
	src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp
	src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.h
	src/server/game/Movement/Spline/MoveSpline.h

2012-12-21 00:00:16 +01:00

..

loadlib

Sourcefile sleanups -> tabs to spaces, remove whitespace - also update the cleanupscripts very slightly

2010-08-08 19:45:53 +02:00

adt.cpp

Scripts/VH: Add an 1 minute pause after each boss fight (instead of 5 seconds)

2012-05-20 18:22:34 +01:00

adt.h

Cleanup/Core: Remove whitespace and tabs

2010-09-12 01:40:27 +02:00

CMakeLists.txt

Misc: Convert from CRLF to LF in cs_misc.cpp

2012-09-04 16:14:15 +01:00

dbcfile.cpp

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

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

dbcfile.h

Core: Fix some silly warnings (some stupid remnants from old times that has bugged me enough)

2012-11-27 02:24:12 +01:00

loadlib.cpp

Scripts/VH: Add an 1 minute pause after each boss fight (instead of 5 seconds)

2012-05-20 18:22:34 +01:00

mpq_libmpq04.h

Core: Fix a few compile warnings

2012-05-20 17:58:35 +01:00

mpq_libmpq.cpp

* Commented useless error message in the map extractor

2010-06-22 17:07:27 -06:00

System.cpp

Tools&Core: Whitespace cleanup

2012-09-30 15:52:10 +01:00

wdt.cpp

Scripts/VH: Add an 1 minute pause after each boss fight (instead of 5 seconds)

2012-05-20 18:22:34 +01:00

wdt.h

Kill off the issues with the map/dbcextractors - and a thanks to imbecile@lavabit for the comment about loadlib.h

2010-06-23 10:16:40 +02:00