From 7a3bc885d070d09bb26c7b6e869d5e93b080f210 Mon Sep 17 00:00:00 2001
From: gugus <gus_512@hotmail.com>
Date: Sun, 11 Dec 2011 11:21:48 +0100
Subject: [PATCH] Merge branch 'master' of
 https://github.com/zinnschlag/openmw.git into journal

Conflicts:
	apps/openmw/CMakeLists.txt
---
 apps/openmw/CMakeLists.txt | 2 --
 1 file changed, 2 deletions(-)

diff --git a/apps/openmw/CMakeLists.txt b/apps/openmw/CMakeLists.txt
index 906308c4c..21f3e18a2 100644
--- 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})