summaryrefslogtreecommitdiff
path: root/mana.cbp
diff options
context:
space:
mode:
authorBertram <bertram@cegetel.net>2010-03-06 15:53:30 +0100
committerBertram <bertram@cegetel.net>2010-03-06 15:53:30 +0100
commitda77a5f25dbf9cdfbb33ddae1c01ed961f41374f (patch)
tree7160c19d185fa8d0bf826c09c9346cdc8354e50d /mana.cbp
parentf0bf3996fbc2f9dc3edc55b45e4fa3a3a6275db4 (diff)
parent3a447afa534573ed4a014372c687ef4028d16760 (diff)
downloadmana-da77a5f25dbf9cdfbb33ddae1c01ed961f41374f.tar.gz
mana-da77a5f25dbf9cdfbb33ddae1c01ed961f41374f.tar.bz2
mana-da77a5f25dbf9cdfbb33ddae1c01ed961f41374f.tar.xz
mana-da77a5f25dbf9cdfbb33ddae1c01ed961f41374f.zip
Merge branch 'master' of gitorious.org:mana/mana
Diffstat (limited to 'mana.cbp')
-rw-r--r--mana.cbp6
1 files changed, 4 insertions, 2 deletions
diff --git a/mana.cbp b/mana.cbp
index 6b5e6dd8..b81560f2 100644
--- a/mana.cbp
+++ b/mana.cbp
@@ -215,8 +215,6 @@
<Unit filename="src\gui\shortcutwindow.h" />
<Unit filename="src\gui\skilldialog.cpp" />
<Unit filename="src\gui\skilldialog.h" />
- <Unit filename="src\gui\skin.cpp" />
- <Unit filename="src\gui\skin.h" />
<Unit filename="src\gui\socialwindow.cpp" />
<Unit filename="src\gui\socialwindow.h" />
<Unit filename="src\gui\specialswindow.cpp" />
@@ -229,6 +227,8 @@
<Unit filename="src\gui\storagewindow.h" />
<Unit filename="src\gui\textdialog.cpp" />
<Unit filename="src\gui\textdialog.h" />
+ <Unit filename="src\gui\theme.cpp" />
+ <Unit filename="src\gui\theme.h" />
<Unit filename="src\gui\trade.cpp" />
<Unit filename="src\gui\trade.h" />
<Unit filename="src\gui\truetypefont.cpp" />
@@ -572,6 +572,8 @@
<Unit filename="src\units.h" />
<Unit filename="src\utils\base64.cpp" />
<Unit filename="src\utils\base64.h" />
+ <Unit filename="src\utils\copynpaste.cpp" />
+ <Unit filename="src\utils\copynpaste.h" />
<Unit filename="src\utils\dtor.h" />
<Unit filename="src\utils\gettext.h" />
<Unit filename="src\utils\mathutils.h" />