summaryrefslogtreecommitdiff
path: root/src/Makefile.am
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2009-01-06 17:50:52 +0100
committerIra Rice <irarice@gmail.com>2009-01-06 11:06:36 -0700
commit14a12cbe586f88ace6d90d9ca5b802edfb546768 (patch)
tree74a724358ec376df7347e566dab1f23fde92751a /src/Makefile.am
parent394989d94081cbc462ba7d567fc88d0c4dff8134 (diff)
downloadmana-14a12cbe586f88ace6d90d9ca5b802edfb546768.tar.gz
mana-14a12cbe586f88ace6d90d9ca5b802edfb546768.tar.bz2
mana-14a12cbe586f88ace6d90d9ca5b802edfb546768.tar.xz
mana-14a12cbe586f88ace6d90d9ca5b802edfb546768.zip
Merged layout handler from mainline
Also fixed login dialog layout. This is the layout handler by Guillaume Melquiond, which he started in commit 59472ef68fdef3f7e8858a81a46e28c127119c58.
Diffstat (limited to 'src/Makefile.am')
-rw-r--r--src/Makefile.am2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index d59198d1..ded201b7 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,6 +1,8 @@
bin_PROGRAMS = aethyra
aethyra_SOURCES = gui/widgets/dropdown.cpp \
gui/widgets/dropdown.h \
+ gui/widgets/layout.cpp \
+ gui/widgets/layout.h \
gui/widgets/resizegrip.cpp \
gui/widgets/resizegrip.h \
gui/box.cpp \