diff options
| author | Andrei Karas <akaras@inbox.ru> | 2011-11-28 19:05:52 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2011-11-28 19:05:52 +0300 |
| commit | b6eb53b9abdf48b88cb1978b9af97f2a879d2717 (patch) | |
| tree | 5aad5623d352ec0b4aa245856958c61a384861c7 /data/graphics | |
| parent | 4d453108f45f9fb2ff4f5715cc1b3ddd63d36a80 (diff) | |
| parent | 71fe51d38a406012e166589b7b720d83c1ab3ade (diff) | |
| download | plus-stripped1.1.11.27.tar.gz plus-stripped1.1.11.27.tar.bz2 plus-stripped1.1.11.27.tar.xz plus-stripped1.1.11.27.zip | |
Merge commit 'v1.1.11.27' into strippedstripped1.1.11.27
Conflicts:
data/Makefile.am
Diffstat (limited to 'data/graphics')
| -rw-r--r-- | data/graphics/gui/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | data/graphics/gui/Makefile.am | 1 | ||||
| -rw-r--r-- | data/graphics/gui/equipmentbox.png | bin | 0 -> 12349 bytes |
3 files changed, 2 insertions, 0 deletions
diff --git a/data/graphics/gui/CMakeLists.txt b/data/graphics/gui/CMakeLists.txt index a7c21e5ea..2c6e4b933 100644 --- a/data/graphics/gui/CMakeLists.txt +++ b/data/graphics/gui/CMakeLists.txt @@ -10,6 +10,7 @@ SET (FILES close_button.png colors.xml deepbox.png + equipmentbox.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 6d04666a5..388d01663 100644 --- a/data/graphics/gui/Makefile.am +++ b/data/graphics/gui/Makefile.am @@ -13,6 +13,7 @@ gui_DATA = \ close_button.png \ colors.xml \ deepbox.png \ + equipmentbox.png \ hscroll_left_default.png \ hscroll_left_highlight.png \ hscroll_left_pressed.png \ diff --git a/data/graphics/gui/equipmentbox.png b/data/graphics/gui/equipmentbox.png Binary files differnew file mode 100644 index 000000000..a1a737a82 --- /dev/null +++ b/data/graphics/gui/equipmentbox.png |
