Merge branch 'master' of https://github.com/zinnschlag/openmw.git into journal

Conflicts:
	apps/openmw/CMakeLists.txt
This commit is contained in:
gugus 2011-12-11 11:21:48 +01:00
parent 4087ab3cda
commit 7a3bc885d0

View file

@ -58,7 +58,6 @@ set(GAMEGUI_HEADER
mwgui/window_base.hpp
mwgui/stats_window.hpp
mwgui/messagebox.hpp
mwgui/journalwindow.hpp
)
set(GAMEGUI
mwgui/window_manager.cpp
@ -75,7 +74,6 @@ set(GAMEGUI
mwgui/window_base.cpp
mwgui/stats_window.cpp
mwgui/messagebox.cpp
mwgui/journalwindow.cpp
)
source_group(apps\\openmw\\mwgui FILES ${GAMEGUI_HEADER} ${GAMEGUI})