Merge branch 'includes'
commite75e03d130fb9021cad7f703a5d36edf24ceb139
authorTom Prince <tom.prince@ualberta.net>
Sun, 16 May 2010 20:39:02 +0000 (16 16:39 -0400)
committerTom Prince <tom.prince@ualberta.net>
Sun, 16 May 2010 20:39:02 +0000 (16 16:39 -0400)
treeb821d3e058da7d847a3b9991ce66f8e826cf45c8
parent2aa3b3ca03d607d751b3d78d9ed8bb9c8438de20
parent9af53be1575f236217c462f83daa8308640958b6
Merge branch 'includes'
16 files changed:
gemrb/core/Actions.cpp
gemrb/core/Actor.cpp
gemrb/core/ActorBlock.cpp
gemrb/core/GSUtils.cpp
gemrb/core/Game.cpp
gemrb/core/GameControl.cpp
gemrb/core/Interface.cpp
gemrb/core/Interface.h
gemrb/core/Map.cpp
gemrb/core/Triggers.cpp
gemrb/core/WorldMapControl.cpp
gemrb/plugins/AREImporter/AREImporter.cpp
gemrb/plugins/FXOpcodes/FXOpcodes.cpp
gemrb/plugins/GUIScript/GUIScript.cpp
gemrb/plugins/IWDOpcodes/IWDOpcodes.cpp
gemrb/plugins/SDLVideo/SDLVideo.cpp