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 /mana.files | |
| 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 'mana.files')
| -rw-r--r-- | mana.files | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -270,6 +270,8 @@ ./src/gui/widgets/vertcontainer.h ./src/gui/widgets/whispertab.cpp ./src/gui/widgets/whispertab.h +./src/gui/widgets/windowcontainer.cpp +./src/gui/widgets/windowcontainer.h ./src/gui/widgets/window.cpp ./src/gui/widgets/window.h ./src/gui/windowmenu.cpp |