diff options
| author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-02-26 21:29:49 +0100 |
|---|---|---|
| committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-02-26 21:29:49 +0100 |
| commit | 3008805eea4b972265597ba196ab05ce64c69965 (patch) | |
| tree | d3195600e956e496b6b21f200fc04e5b08cab368 /data | |
| parent | 3ad6ac47d4967870a54fddd66aa9996724115b94 (diff) | |
| parent | 6b0cff837b7adae56dc90d12e9c0e256e6aab134 (diff) | |
| download | mana-3008805eea4b972265597ba196ab05ce64c69965.tar.gz mana-3008805eea4b972265597ba196ab05ce64c69965.tar.bz2 mana-3008805eea4b972265597ba196ab05ce64c69965.tar.xz mana-3008805eea4b972265597ba196ab05ce64c69965.zip | |
Merge branch 'aethyra/master'
Conflicts:
data/graphics/images/login_wallpaper.png
src/being.cpp
src/beingmanager.cpp
src/engine.cpp
src/game.cpp
src/gui/buysell.cpp
src/gui/buysell.h
src/gui/gui.h
src/gui/npc_text.cpp
src/gui/npc_text.h
src/gui/npcintegerdialog.cpp
src/gui/npclistdialog.cpp
src/gui/npclistdialog.h
src/gui/npcstringdialog.cpp
src/gui/sell.cpp
src/gui/shop.cpp
src/gui/table.cpp
src/net/beinghandler.cpp
src/net/npchandler.cpp
src/net/playerhandler.cpp
src/npc.cpp
src/npc.h
src/shopitem.cpp
src/shopitem.h
src/utils/stringutils.cpp
src/utils/stringutils.h
src/utils/trim.h
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 f564253a..5ecadede 100644 --- a/data/graphics/gui/CMakeLists.txt +++ b/data/graphics/gui/CMakeLists.txt @@ -10,9 +10,6 @@ SET (FILES 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/Makefile.am b/data/graphics/gui/Makefile.am index e78018b7..2d68a20c 100644 --- a/data/graphics/gui/Makefile.am +++ b/data/graphics/gui/Makefile.am @@ -13,9 +13,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 |
