diff options
| author | Jared Adams <jaxad0127@gmail.com> | 2010-03-02 13:42:14 +0000 |
|---|---|---|
| committer | Jared Adams <jaxad0127@gmail.com> | 2010-03-02 13:42:14 +0000 |
| commit | 0c8c8cf7ea63def0d454f30227584a5f3062c013 (patch) | |
| tree | 9929ddd6c0ecaffef0d75411eeaea2f9fa7fbdfd /src/CMakeLists.txt | |
| parent | 4ff5c3b854215b1f55e70106a4c53225fc953619 (diff) | |
| download | Mana-0c8c8cf7ea63def0d454f30227584a5f3062c013.tar.gz Mana-0c8c8cf7ea63def0d454f30227584a5f3062c013.tar.bz2 Mana-0c8c8cf7ea63def0d454f30227584a5f3062c013.tar.xz Mana-0c8c8cf7ea63def0d454f30227584a5f3062c013.zip | |
Revert "Merge WindowContainer into Viewport and remove extra members"
This reverts commit 67e678094b9fddd21fb3c690130e772937ab2746.
Conflicts:
src/gui/gui.cpp
src/gui/viewport.cpp
Diffstat (limited to 'src/CMakeLists.txt')
| -rw-r--r-- | src/CMakeLists.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 9a27b610..b84e59c6 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -194,6 +194,8 @@ SET(SRCS gui/widgets/whispertab.h gui/widgets/window.cpp gui/widgets/window.h + gui/widgets/windowcontainer.cpp + gui/widgets/windowcontainer.h gui/beingpopup.cpp gui/beingpopup.h gui/buy.cpp |