diff options
| author | goblin911 <[email protected]> | 2013-08-25 21:16:45 +0800 |
|---|---|---|
| committer | goblin911 <[email protected]> | 2013-08-25 21:16:45 +0800 |
| commit | 2efdc2f20f0306791ced5ec78a1acddfaf086f42 (patch) | |
| tree | a85f2b32d6e6da9d7329ab975fea3bd79e1b94b6 /client/bin/res/drawable | |
| parent | e5599da7fdd344fdcb49e8d6780a1e2ad358ee2d (diff) | |
| parent | 263967cbb477983ae8680b431c1d93f102971c30 (diff) | |
Merge branch 'master' of https://github.com/Determinant/piztor
Conflicts:
client/Piztor/bin/classes/com/macaroon/piztor/ActMgr.class
client/Piztor/bin/classes/com/macaroon/piztor/AppMgr.class
client/Piztor/bin/classes/com/macaroon/piztor/R$drawable.class
client/Piztor/bin/classes/com/macaroon/piztor/R$id.class
client/Piztor/bin/classes/com/macaroon/piztor/R$layout.class
client/Piztor/bin/classes/com/macaroon/piztor/R$menu.class
client/Piztor/bin/classes/com/macaroon/piztor/R$string.class
client/Piztor/gen/com/macaroon/piztor/R.java
client/Piztor/res/values/strings.xml
client/bin/classes/com/macaroon/piztor/ActStatus.class
client/bin/classes/com/macaroon/piztor/EmptyStatus.class
client/bin/classes/com/macaroon/piztor/Setting.class
client/src/com/macaroon/piztor/AppMgr.java
client/src/com/macaroon/piztor/Setting.java
Diffstat (limited to 'client/bin/res/drawable')
19 files changed, 0 insertions, 0 deletions
diff --git a/client/bin/res/drawable/bottom_img.png b/client/bin/res/drawable/bottom_img.png Binary files differnew file mode 100644 index 0000000..ee34eb0 --- /dev/null +++ b/client/bin/res/drawable/bottom_img.png diff --git a/client/bin/res/drawable/footbar_background.png b/client/bin/res/drawable/footbar_background.png Binary files differnew file mode 100644 index 0000000..d0ad14f --- /dev/null +++ b/client/bin/res/drawable/footbar_background.png diff --git a/client/bin/res/drawable/footbar_checkin.png b/client/bin/res/drawable/footbar_checkin.png Binary files differnew file mode 100644 index 0000000..9d9ccd0 --- /dev/null +++ b/client/bin/res/drawable/footbar_checkin.png diff --git a/client/bin/res/drawable/footbar_checkin_1.png b/client/bin/res/drawable/footbar_checkin_1.png Binary files differnew file mode 100644 index 0000000..a14f872 --- /dev/null +++ b/client/bin/res/drawable/footbar_checkin_1.png diff --git a/client/bin/res/drawable/footbar_fetch.png b/client/bin/res/drawable/footbar_fetch.png Binary files differnew file mode 100644 index 0000000..a5e9bd3 --- /dev/null +++ b/client/bin/res/drawable/footbar_fetch.png diff --git a/client/bin/res/drawable/footbar_fetch_1.png b/client/bin/res/drawable/footbar_fetch_1.png Binary files differnew file mode 100644 index 0000000..214b712 --- /dev/null +++ b/client/bin/res/drawable/footbar_fetch_1.png diff --git a/client/bin/res/drawable/footbar_marker.png b/client/bin/res/drawable/footbar_marker.png Binary files differnew file mode 100644 index 0000000..e408cf8 --- /dev/null +++ b/client/bin/res/drawable/footbar_marker.png diff --git a/client/bin/res/drawable/footbar_marker_1.png b/client/bin/res/drawable/footbar_marker_1.png Binary files differnew file mode 100644 index 0000000..1262bda --- /dev/null +++ b/client/bin/res/drawable/footbar_marker_1.png diff --git a/client/bin/res/drawable/footbar_search.png b/client/bin/res/drawable/footbar_search.png Binary files differnew file mode 100644 index 0000000..1169b79 --- /dev/null +++ b/client/bin/res/drawable/footbar_search.png diff --git a/client/bin/res/drawable/footbar_search_1.png b/client/bin/res/drawable/footbar_search_1.png Binary files differnew file mode 100644 index 0000000..9dd9611 --- /dev/null +++ b/client/bin/res/drawable/footbar_search_1.png diff --git a/client/bin/res/drawable/footbar_select_bg.png b/client/bin/res/drawable/footbar_select_bg.png Binary files differnew file mode 100644 index 0000000..3de79d6 --- /dev/null +++ b/client/bin/res/drawable/footbar_select_bg.png diff --git a/client/bin/res/drawable/footbar_settings.png b/client/bin/res/drawable/footbar_settings.png Binary files differnew file mode 100644 index 0000000..040a673 --- /dev/null +++ b/client/bin/res/drawable/footbar_settings.png diff --git a/client/bin/res/drawable/footbar_settings_1.png b/client/bin/res/drawable/footbar_settings_1.png Binary files differnew file mode 100644 index 0000000..05db6fb --- /dev/null +++ b/client/bin/res/drawable/footbar_settings_1.png diff --git a/client/bin/res/drawable/footbar_unselect_bg.png b/client/bin/res/drawable/footbar_unselect_bg.png Binary files differnew file mode 100644 index 0000000..fe14eb2 --- /dev/null +++ b/client/bin/res/drawable/footbar_unselect_bg.png diff --git a/client/bin/res/drawable/horizontal_line.png b/client/bin/res/drawable/horizontal_line.png Binary files differnew file mode 100644 index 0000000..e56695f --- /dev/null +++ b/client/bin/res/drawable/horizontal_line.png diff --git a/client/bin/res/drawable/navigation_back.png b/client/bin/res/drawable/navigation_back.png Binary files differnew file mode 100644 index 0000000..901ba07 --- /dev/null +++ b/client/bin/res/drawable/navigation_back.png diff --git a/client/bin/res/drawable/navigation_back_1.png b/client/bin/res/drawable/navigation_back_1.png Binary files differnew file mode 100644 index 0000000..59f6260 --- /dev/null +++ b/client/bin/res/drawable/navigation_back_1.png diff --git a/client/bin/res/drawable/title_logo.png b/client/bin/res/drawable/title_logo.png Binary files differnew file mode 100644 index 0000000..d167c79 --- /dev/null +++ b/client/bin/res/drawable/title_logo.png diff --git a/client/bin/res/drawable/topbar_background.png b/client/bin/res/drawable/topbar_background.png Binary files differnew file mode 100644 index 0000000..851f92f --- /dev/null +++ b/client/bin/res/drawable/topbar_background.png |
