diff options
| author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-03-23 21:59:21 +0100 |
|---|---|---|
| committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-03-23 22:00:09 +0100 |
| commit | 99e8a3fd77b63a029fe02dcf771b6af1aad252ed (patch) | |
| tree | 03c296d1f89859aae35336dfe2f58df09d256fd3 /tmw.cbp | |
| parent | fa8a4bf49100c0a1d5b96e00803f43bbbb861100 (diff) | |
| parent | 347452b9b69ef3af29c577b7751082822e900c01 (diff) | |
| download | mana-client-99e8a3fd77b63a029fe02dcf771b6af1aad252ed.tar.gz mana-client-99e8a3fd77b63a029fe02dcf771b6af1aad252ed.tar.bz2 mana-client-99e8a3fd77b63a029fe02dcf771b6af1aad252ed.tar.xz mana-client-99e8a3fd77b63a029fe02dcf771b6af1aad252ed.zip | |
Merge branch 'aethyra/master'
Conflicts:
Many files.
Diffstat (limited to 'tmw.cbp')
| -rw-r--r-- | tmw.cbp | 7 |
1 files changed, 7 insertions, 0 deletions
@@ -162,6 +162,8 @@ <Unit filename="src\gui\itempopup.h" /> <Unit filename="src\gui\itemshortcutcontainer.cpp" /> <Unit filename="src\gui\itemshortcutcontainer.h" /> + <Unit filename="src\gui\label.cpp" /> + <Unit filename="src\gui\label.h" /> <Unit filename="src\gui\linkhandler.h" /> <Unit filename="src\gui\listbox.cpp" /> <Unit filename="src\gui\listbox.h" /> @@ -189,6 +191,8 @@ <Unit filename="src\gui\passwordfield.h" /> <Unit filename="src\gui\playerbox.cpp" /> <Unit filename="src\gui\playerbox.h" /> + <Unit filename="src\gui\popup.cpp" /> + <Unit filename="src\gui\popup.h" /> <Unit filename="src\gui\popupmenu.cpp" /> <Unit filename="src\gui\popupmenu.h" /> <Unit filename="src\gui\progressbar.cpp" /> @@ -230,6 +234,8 @@ <Unit filename="src\gui\shortcutwindow.h" /> <Unit filename="src\gui\skill.cpp" /> <Unit filename="src\gui\skill.h" /> + <Unit filename="src\gui\skin.cpp" /> + <Unit filename="src\gui\skin.h" /> <Unit filename="src\gui\slider.cpp" /> <Unit filename="src\gui\slider.h" /> <Unit filename="src\gui\speechbubble.cpp" /> @@ -246,6 +252,7 @@ <Unit filename="src\gui\textbox.h" /> <Unit filename="src\gui\textfield.cpp" /> <Unit filename="src\gui\textfield.h" /> + <Unit filename="src\gui\textrenderer.h" /> <Unit filename="src\gui\trade.cpp" /> <Unit filename="src\gui\trade.h" /> <Unit filename="src\gui\truetypefont.cpp" /> |