mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-19 22:23:51 +00:00
Code Issues Releases Wiki Activity

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

Browse source 
Conflicts:
	apps/openmw/CMakeLists.txt
This commit is contained in:
gugus 2011-12-11 11:21:48 +01:00
parent 4087ab3cda
commit 7a3bc885d0
1 changed files with 0 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/openmw/CMakeLists.txt
View file

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