diff options
| author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-03-25 22:50:59 +0100 |
|---|---|---|
| committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-03-25 22:50:59 +0100 |
| commit | cc79f0fe21e1a2ef73cbe987d54e848b9a47142d (patch) | |
| tree | edd316eb6094f0c02d6d014385865dcd88a2bc56 /data | |
| parent | b0df784f1be44a657ca8092069488602270629b7 (diff) | |
| parent | 99e8a3fd77b63a029fe02dcf771b6af1aad252ed (diff) | |
| download | mana-cc79f0fe21e1a2ef73cbe987d54e848b9a47142d.tar.gz mana-cc79f0fe21e1a2ef73cbe987d54e848b9a47142d.tar.bz2 mana-cc79f0fe21e1a2ef73cbe987d54e848b9a47142d.tar.xz mana-cc79f0fe21e1a2ef73cbe987d54e848b9a47142d.zip | |
Merge branch 'eathena/master'
Conflicts:
A lot of files.
Diffstat (limited to 'data')
| -rw-r--r-- | data/graphics/gui/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | data/graphics/gui/Makefile.am | 3 | ||||
| -rw-r--r-- | data/graphics/gui/hits_blue.png | bin | 884 -> 0 bytes | |||
| -rw-r--r-- | data/graphics/gui/hits_red.png | bin | 813 -> 0 bytes | |||
| -rw-r--r-- | data/graphics/gui/hits_yellow.png | bin | 907 -> 0 bytes |
5 files changed, 0 insertions, 6 deletions
diff --git a/data/graphics/gui/CMakeLists.txt b/data/graphics/gui/CMakeLists.txt index 347e9f5e..cca412f2 100644 --- a/data/graphics/gui/CMakeLists.txt +++ b/data/graphics/gui/CMakeLists.txt @@ -13,9 +13,6 @@ SET (FILES default.png equip_bg.png gui.xml - hits_blue.png - hits_red.png - hits_yellow.png hscroll_left_default.png hscroll_left_highlight.png hscroll_left_pressed.png diff --git a/data/graphics/gui/Makefile.am b/data/graphics/gui/Makefile.am index d697ffd7..aaaac211 100644 --- a/data/graphics/gui/Makefile.am +++ b/data/graphics/gui/Makefile.am @@ -15,9 +15,6 @@ gui_DATA = \ deepbox.png \ default.png \ gui.xml \ - hits_blue.png \ - hits_red.png \ - hits_yellow.png \ hscroll_left_default.png \ hscroll_left_highlight.png \ hscroll_left_pressed.png \ diff --git a/data/graphics/gui/hits_blue.png b/data/graphics/gui/hits_blue.png Binary files differdeleted file mode 100644 index cfb04ab8..00000000 --- a/data/graphics/gui/hits_blue.png +++ /dev/null diff --git a/data/graphics/gui/hits_red.png b/data/graphics/gui/hits_red.png Binary files differdeleted file mode 100644 index 150f1c1e..00000000 --- a/data/graphics/gui/hits_red.png +++ /dev/null diff --git a/data/graphics/gui/hits_yellow.png b/data/graphics/gui/hits_yellow.png Binary files differdeleted file mode 100644 index 6975dfd5..00000000 --- a/data/graphics/gui/hits_yellow.png +++ /dev/null |
