merge master into wintergrasp and fix build errors. yay me!

This commit is contained in:
Kandera
2012-02-21 11:33:49 -05:00
parent c28a8aafc0
commit 16f2c3a48e
7 changed files with 60 additions and 76 deletions

View File

@@ -14,13 +14,13 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "ScriptPCH.h"
#include "BattlefieldMgr.h"
#include "BattlefieldWG.h"
#include "Battlefield.h"
#include "ScriptSystem.h"
#include "WorldSession.h"
#include "ObjectMgr.h"
#include "Vehicle.h"
#define GOSSIP_HELLO_DEMO1 "Build catapult."
#define GOSSIP_HELLO_DEMO2 "Build demolisher."