Commit graph

4 commits

Author SHA1 Message Date
tomrus88
9cc6f1f3ec Merge branch 'master' into 303
Conflicts:
	src/game/Level2.cpp
	src/game/Pet.cpp
	src/game/Player.cpp
2008-11-03 14:44:58 +03:00
VladimirMangos
166007525e More fixes for wrong format arg/value pairs. 2008-11-03 01:48:16 +03:00
tomrus88
9c8864f134 Updated objects stuff 2008-10-26 10:20:52 +03:00
TheLuda
800ee76535 Imported MaNGOS revision 6767 from http://mangos.svn.sourceforge.net/svnroot/mangos/trunk/ 2008-10-14 00:29:20 +02:00