*Merge.

--HG-- branch : trunk
2009-02-04 17:22:43 -06:00
parent 5d4d953055 c745eba4a1
commit d69198732e
373 changed files with 2607 additions and 2215 deletions
@@ -63,7 +63,7 @@ GM_Ticket* TicketMgr::GetGMTicketByName(const char* name)
 	Player *plr = objmgr.GetPlayer(pname.c_str());
 	if(!plr)
 		return NULL;
-	
+
 	uint64 playerGuid = plr->GetGUID();

 	for(GmTicketList::iterator i = GM_TicketList.begin(); i != GM_TicketList.end();)
@@ -184,7 +184,7 @@ void TicketMgr::SaveGMTicket(GM_Ticket* ticket)
    CharacterDatabase.BeginTransaction();
 	CharacterDatabase.Execute(ss.str().c_str());
 	CharacterDatabase.CommitTransaction();
-		
+
 }

 void TicketMgr::UpdateGMTicket(GM_Ticket *ticket)