apps-android-commons/commons
YuviPanda 064dbb0df6 Merge branch 'campaigns'
Conflicts:
	commons/res/values/strings.xml
	commons/src/main/java/org/wikimedia/commons/Media.java

Change-Id: Ib8c74cbf88630f11b3fbfee903800e7acf7b2fd4
2013-10-15 22:54:03 +05:30
..
assets/fontconfig Mavenized (almost) everything - Transcode feature removed 2013-01-25 03:04:21 +05:30
jni Mavenized (almost) everything - Transcode feature removed 2013-01-25 03:04:21 +05:30
res Merge branch 'campaigns' 2013-10-15 22:54:03 +05:30
src/main Merge branch 'campaigns' 2013-10-15 22:54:03 +05:30
AndroidManifest.xml Merge branch 'campaigns' 2013-10-15 22:54:03 +05:30
default.properties Mavenized (almost) everything - Transcode feature removed 2013-01-25 03:04:21 +05:30
ic_launcher.png Added new launcher icons 2013-07-18 17:27:51 +00:00
pom.xml Update ActionBarSherlock to 4.4.0 2013-07-30 02:43:54 +05:30