diff options
| author | Philipp Sehmisch <crush@themanaworld.org> | 2009-03-18 18:37:19 +0100 |
|---|---|---|
| committer | Philipp Sehmisch <crush@themanaworld.org> | 2009-03-18 18:37:19 +0100 |
| commit | 1231406e5c9ac43d60c6ffb0ae664970b0e4eee0 (patch) | |
| tree | 45af35e9a6ee56b71f06d76efa7706bf16eaec9a /tmw.cbp | |
| parent | 04c189cf7e3e8a393c81bfb3e11058ceace8802a (diff) | |
| parent | 4bd8d3fd96fab681ee4520b6a6f2a6ee73f6eb97 (diff) | |
| download | mana-1231406e5c9ac43d60c6ffb0ae664970b0e4eee0.tar.gz mana-1231406e5c9ac43d60c6ffb0ae664970b0e4eee0.tar.bz2 mana-1231406e5c9ac43d60c6ffb0ae664970b0e4eee0.tar.xz mana-1231406e5c9ac43d60c6ffb0ae664970b0e4eee0.zip | |
Merge branch 'master' of git@gitorious.org:tmw/eathena
Diffstat (limited to 'tmw.cbp')
| -rw-r--r-- | tmw.cbp | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -126,8 +126,6 @@ <Unit filename="src\gui\chatinput.h" /> <Unit filename="src\gui\checkbox.cpp" /> <Unit filename="src\gui\checkbox.h" /> - <Unit filename="src\gui\color.cpp" /> - <Unit filename="src\gui\color.h" /> <Unit filename="src\gui\confirm_dialog.cpp" /> <Unit filename="src\gui\confirm_dialog.h" /> <Unit filename="src\gui\connection.cpp" /> @@ -185,6 +183,8 @@ <Unit filename="src\gui\npcstringdialog.h" /> <Unit filename="src\gui\ok_dialog.cpp" /> <Unit filename="src\gui\ok_dialog.h" /> + <Unit filename="src\gui\palette.cpp" /> + <Unit filename="src\gui\palette.h" /> <Unit filename="src\gui\passwordfield.cpp" /> <Unit filename="src\gui\passwordfield.h" /> <Unit filename="src\gui\playerbox.cpp" /> @@ -266,6 +266,8 @@ <Unit filename="src\gui\widgets\tab.h" /> <Unit filename="src\gui\widgets\tabbedarea.cpp" /> <Unit filename="src\gui\widgets\tabbedarea.h" /> + <Unit filename="src\gui\widgets\textpreview.cpp" /> + <Unit filename="src\gui\widgets\textpreview.h" /> <Unit filename="src\gui\window.cpp" /> <Unit filename="src\gui\window.h" /> <Unit filename="src\gui\windowcontainer.cpp" /> |