diff options
| author | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2011-01-03 23:18:05 +0100 |
|---|---|---|
| committer | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2011-01-03 23:19:29 +0100 |
| commit | b9fbd8529d6aa8d8f229eae81b16134de07db346 (patch) | |
| tree | ceea6eecbd26c973441ee5f4f05362fd78c72cb0 /mana.cbp | |
| parent | 0bb9a42066e4cf0f9fbc83fa2e742053dc40f1d4 (diff) | |
| parent | 2851c8962522a4e8f8b62a498b113dc6b1eab56d (diff) | |
| download | mana-client-b9fbd8529d6aa8d8f229eae81b16134de07db346.tar.gz mana-client-b9fbd8529d6aa8d8f229eae81b16134de07db346.tar.bz2 mana-client-b9fbd8529d6aa8d8f229eae81b16134de07db346.tar.xz mana-client-b9fbd8529d6aa8d8f229eae81b16134de07db346.zip | |
Merge branch '0.5'
Conflicts:
po/es.po
po/fr.po
src/net/tmwa/adminhandler.cpp
update-creator.sh
Diffstat (limited to 'mana.cbp')
| -rw-r--r-- | mana.cbp | 2 |
1 files changed, 0 insertions, 2 deletions
@@ -529,8 +529,6 @@ <Unit filename="src\resources\action.h" /> <Unit filename="src\resources\ambientlayer.cpp" /> <Unit filename="src\resources\ambientlayer.h" /> - <Unit filename="src\resources\ambientoverlay.cpp" /> - <Unit filename="src\resources\ambientoverlay.h" /> <Unit filename="src\resources\animation.cpp" /> <Unit filename="src\resources\animation.h" /> <Unit filename="src\resources\beinginfo.cpp" /> |