diff options
| author | Philipp Sehmisch <crush@themanaworld.org> | 2009-12-25 17:46:10 +0100 |
|---|---|---|
| committer | Philipp Sehmisch <crush@themanaworld.org> | 2009-12-25 17:46:10 +0100 |
| commit | 5f5f174e9143dd76ea1667077d72b8433ee6d952 (patch) | |
| tree | b47f7274072eecb145aff09abbe4cae5214bbded | |
| parent | 392b04263fd4e770d75890cd790d562cc23438dd (diff) | |
| parent | 714a02b8978748197d523acf4a7764a31f0eb64a (diff) | |
| download | mana-client-5f5f174e9143dd76ea1667077d72b8433ee6d952.tar.gz mana-client-5f5f174e9143dd76ea1667077d72b8433ee6d952.tar.bz2 mana-client-5f5f174e9143dd76ea1667077d72b8433ee6d952.tar.xz mana-client-5f5f174e9143dd76ea1667077d72b8433ee6d952.zip | |
Merge branch 'master' of git@gitorious.org:mana/mana
| -rw-r--r-- | mana.cbp | 2 | ||||
| -rw-r--r-- | src/Makefile.am | 2 |
2 files changed, 4 insertions, 0 deletions
@@ -823,6 +823,8 @@ <Unit filename="src\resources\action.h" /> <Unit filename="src\resources\ambientoverlay.cpp" /> <Unit filename="src\resources\ambientoverlay.h" /> + <Unit filename="src\resources\ambientlayer.cpp" /> + <Unit filename="src\resources\ambientlayer.h" /> <Unit filename="src\resources\animation.cpp" /> <Unit filename="src\resources\animation.h" /> <Unit filename="src\resources\colordb.cpp" /> diff --git a/src/Makefile.am b/src/Makefile.am index 21750f26..ec84f273 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -236,6 +236,8 @@ mana_SOURCES = gui/widgets/avatar.cpp \ net/worldinfo.h \ resources/action.cpp \ resources/action.h \ + resources/ambientlayer.cpp \ + resources/ambientlayer.h \ resources/ambientoverlay.cpp \ resources/ambientoverlay.h \ resources/animation.cpp \ |