From 0c8c8cf7ea63def0d454f30227584a5f3062c013 Mon Sep 17 00:00:00 2001
From: Jared Adams <jaxad0127@gmail.com>
Date: Tue, 2 Mar 2010 13:42:14 +0000
Subject: Revert "Merge WindowContainer into Viewport and remove extra members"

This reverts commit 67e678094b9fddd21fb3c690130e772937ab2746.

Conflicts:

	src/gui/gui.cpp
	src/gui/viewport.cpp
---
 mana.cbp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'mana.cbp')

diff --git a/mana.cbp b/mana.cbp
index 2d6c3139..6b5e6dd8 100644
--- a/mana.cbp
+++ b/mana.cbp
@@ -326,6 +326,8 @@
 		<Unit filename="src\gui\widgets\whispertab.h" />
 		<Unit filename="src\gui\widgets\window.cpp" />
 		<Unit filename="src\gui\widgets\window.h" />
+		<Unit filename="src\gui\widgets\windowcontainer.cpp" />
+		<Unit filename="src\gui\widgets\windowcontainer.h" />
 		<Unit filename="src\gui\windowmenu.cpp" />
 		<Unit filename="src\gui\windowmenu.h" />
 		<Unit filename="src\gui\worldselectdialog.cpp" />
-- 
cgit v1.2.3-70-g09d2