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

Conflicts: apps/openmw/CMakeLists.txt
13 years ago · 7a3bc885d0
parent 4087ab3cda
commit 7a3bc885d0
1 changed files with 0 additions and 2 deletions
--- a/apps/openmw/CMakeLists.txt
+++ b/apps/openmw/CMakeLists.txt
@ -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})