Merge commit 'e8d9796'

2015-12-13 11:15:00 -05:00 · 2015-12-13 11:15:00 -05:00 · 9e6bb48105
commit 9e6bb48105
parent 174859ad8d e8d9796ba0
6 changed files with 1 additions and 1 deletions
--- a/MasterPassword/Java/masterpassword-android/res/drawable-mdpi/icon.png
+++ b/MasterPassword/Java/masterpassword-android/res/drawable-mdpi/icon.png
--- a/MasterPassword/Java/masterpassword-android/res/drawable-xhdpi/icon.png
+++ b/MasterPassword/Java/masterpassword-android/res/drawable-xhdpi/icon.png
--- a/MasterPassword/Java/masterpassword-android/res/drawable-xxxhdpi/icon.png
+++ b/MasterPassword/Java/masterpassword-android/res/drawable-xxxhdpi/icon.png
--- a/Site/2013-05/masterpassword-android-2.3.apk
+++ b/Site/2013-05/masterpassword-android-2.3.apk
--- a/Site/2013-05/masterpassword-gui-2.3.jar
+++ b/Site/2013-05/masterpassword-gui-2.3.jar
--- a/Site/2013-05/masterpassword-gui.jar.rev
+++ b/Site/2013-05/masterpassword-gui.jar.rev
@ -1 +1 @@
-4c4aaac08b56bafaa8789f52d59f9ee4755497da
+8f1d8976600b0305e8daade529ec8a073a4c7c57
`@ -1 +1 @@`
	`4c4aaac08b56bafaa8789f52d59f9ee4755497da`	`8f1d8976600b0305e8daade529ec8a073a4c7c57`