diff options
author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-01-30 01:34:16 +0100 |
---|---|---|
committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-02-09 20:00:07 +0100 |
commit | 1b1050da1c7b84cc72b7efbb2229294975be9e10 (patch) | |
tree | 68d15ccb015d58aeb5797ffd06efca3e55997c24 /data/graphics/gui/CMakeLists.txt | |
parent | 0d4142a891cd228da24ee3aa3bbd7dc622da5b75 (diff) | |
parent | 955a7613d1fe116fe5e1da07a222b6849b3c885c (diff) | |
download | mana-1b1050da1c7b84cc72b7efbb2229294975be9e10.tar.gz mana-1b1050da1c7b84cc72b7efbb2229294975be9e10.tar.bz2 mana-1b1050da1c7b84cc72b7efbb2229294975be9e10.tar.xz mana-1b1050da1c7b84cc72b7efbb2229294975be9e10.zip |
Merged with Aethyra master as of 2009-01-27
Conflicts:
Almost everywhere.
Diffstat (limited to 'data/graphics/gui/CMakeLists.txt')
-rw-r--r-- | data/graphics/gui/CMakeLists.txt | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/data/graphics/gui/CMakeLists.txt b/data/graphics/gui/CMakeLists.txt index 3d617696..6351d5ba 100644 --- a/data/graphics/gui/CMakeLists.txt +++ b/data/graphics/gui/CMakeLists.txt @@ -8,7 +8,8 @@ SET (FILES checkbox.png close_button.png deepbox.png - fixedfont.png + default.png + gui.xml hits_blue.png hits_red.png hits_yellow.png @@ -20,16 +21,13 @@ SET (FILES hscroll_right_pressed.png item_shortcut_bgr.png mouse.png - menuitemD.png - menuitemF.png - menuitemN.png - menuitemP.png radioin.png radioout.png resize.png - rpgfont_wider.png selection.png slider.png + speech_bubble.png + speech_bubble.xml tab.png tabselected.png target-cursor-blue-l.png @@ -38,7 +36,6 @@ SET (FILES target-cursor-red-l.png target-cursor-red-m.png target-cursor-red-s.png - thickborder.png unknown-item.png vscroll_blue.png vscroll_down_default.png |