OSDN Git Service

Trying again to merge master-dev into master
authorAdam Shanks <chainsdd@gmail.com>
Tue, 27 Sep 2011 11:42:14 +0000 (12:42 +0100)
committerAdam Shanks <chainsdd@gmail.com>
Tue, 27 Sep 2011 11:42:14 +0000 (12:42 +0100)
commitec86c066cb85a5618d4bf598feb34fa62b171185
treed9444fa234647d85641aecde465473171a7de6ef
parentadad0337df171fb6eb4893f2193b9e2eb3d29d61
Trying again to merge master-dev into master
15 files changed:
res/drawable-hdpi/btn_bg_pressed.9.png [moved from res/drawable/divider_horizontal_dark_opaque.9.png with 88% similarity]
res/drawable-hdpi/dialog_divider.9.png [moved from res/drawable-hdpi/divider_horizontal_bright.9.png with 100% similarity]
res/drawable-mdpi/dialog_background.9.png [moved from res/drawable/dialog_background.9.png with 100% similarity]
res/drawable-mdpi/dialog_divider.9.png [moved from res/drawable/divider_horizontal_bright.9.png with 100% similarity]
res/drawable-mdpi/perm_allow_dot.png [moved from res/drawable/perm_allow_dot.png with 100% similarity]
res/drawable-mdpi/perm_allow_emo.png [moved from res/drawable/perm_allow_emo.png with 100% similarity]
res/drawable-mdpi/perm_deny_dot.png [moved from res/drawable/perm_deny_dot.png with 100% similarity]
res/drawable-mdpi/perm_deny_emo.png [moved from res/drawable/perm_deny_emo.png with 100% similarity]
res/drawable-mdpi/stat_su.png [moved from res/drawable/stat_su.png with 100% similarity]
res/drawable-mdpi/sym_def_app_icon.png [moved from res/drawable/sym_def_app_icon.png with 100% similarity]
res/drawable/app_list_background.xml [moved from res/layout/list_separator.xml with 71% similarity]
res/drawable/app_list_divider.xml [new file with mode: 0644]
res/drawable/app_list_pressed.xml [new file with mode: 0644]
res/drawable/btn_dial.xml [new file with mode: 0644]
src/com/noshufou/android/su/widget/PinnedHeaderListView.java [moved from src/com/noshufou/android/su/PinnedHeaderListView.java with 87% similarity]