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/Makefile.am | |
| 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/Makefile.am')
| -rw-r--r-- | src/Makefile.am | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 61e30978..f36fcdf2 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -93,6 +93,8 @@ mana_SOURCES = gui/widgets/avatarlistbox.cpp \ 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 \ |