Karl/BobStore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
BobStore/res
History
Peter Serwylo 82af6fc60e Merge branch 'master' into improvement/16/manage-single-repo 
Phew, monster merge. Going to commit after *seemingly* resolving
conflicts, but it will no doubt take a few compile and runs to sort out
any funny stuff.

Conflicts:
	AndroidManifest.xml
	res/layout/addrepo.xml
	res/layout/appdetails.xml
	res/layout/repolisticons.xml
	res/values/strings.xml
	src/org/fdroid/fdroid/DB.java
	src/org/fdroid/fdroid/FDroid.java
	src/org/fdroid/fdroid/ManageRepo.java
	src/org/fdroid/fdroid/UpdateService.java
2013-12-06 08:43:11 +11:00
..
drawable
Remove duplicate drawable
2013-10-22 15:34:25 +02:00
drawable-hdpi
Forgot to add default app drawables
2013-11-02 16:31:12 +01:00
drawable-ldpi
Forgot to add default app drawables
2013-11-02 16:31:12 +01:00
drawable-mdpi
Forgot to add default app drawables
2013-11-02 16:31:12 +01:00
drawable-xhdpi
Forgot to add default app drawables
2013-11-02 16:31:12 +01:00
drawable-xxhdpi
Forgot to add default app drawables
2013-11-02 16:31:12 +01:00
layout
Merge branch 'master' into improvement/16/manage-single-repo
2013-12-06 08:43:11 +11:00
layout-land
No need for alignment on appdetails
2013-09-26 00:09:57 +02:00
menu
WIP: implementing context and action bar menus for repo management.
2013-12-05 13:04:33 +11:00
values
Merge branch 'master' into improvement/16/manage-single-repo
2013-12-06 08:43:11 +11:00
values-ar
Translation updates
2013-11-08 16:42:53 +00:00
values-bg
Translation updates
2013-11-08 16:42:53 +00:00
values-ca
Translation updates
2013-11-08 16:42:53 +00:00
values-de
Translation updates
2013-11-22 21:01:19 +00:00
values-el
Translation updates
2013-11-08 22:24:04 +00:00
values-eo
Translation updates
2013-11-08 16:42:53 +00:00
values-es
Translation updates
2013-11-08 16:42:53 +00:00
values-eu
Translation updates
2013-11-22 20:08:59 +00:00
values-fa
Translation updates
2013-11-22 20:08:59 +00:00
values-fi
Translation updates
2013-11-22 20:08:59 +00:00
values-fr
Translation updates
2013-11-22 20:08:59 +00:00
values-gl
Translation updates
2013-11-22 20:08:59 +00:00
values-gu
Translation updates
2013-11-08 16:42:53 +00:00
values-he
Translation updates
2013-11-08 16:42:53 +00:00
values-it
Translation updates
2013-11-11 09:49:35 +00:00
values-nb
Translation updates
2013-11-22 20:08:59 +00:00
values-nl
Translation updates
2013-11-22 21:01:19 +00:00
values-pl
Translation updates
2013-11-08 16:42:53 +00:00
values-pt-rBR
Translation updates
2013-11-08 16:42:53 +00:00
values-ro
Translation updates
2013-11-08 16:42:53 +00:00
values-ru
Translation updates
2013-11-08 16:42:53 +00:00
values-sl
Translation updates
2013-11-22 20:08:59 +00:00
values-sr
Merge branch 'master' of gitorious.org:f-droid/fdroidclient
2013-11-08 17:03:13 +00:00
values-sv
Translation updates
2013-11-22 20:08:59 +00:00
values-tr
Translation updates
2013-11-08 22:24:04 +00:00
values-ug
Merge branch 'master' of gitorious.org:f-droid/fdroidclient
2013-11-08 17:03:13 +00:00
values-uk
Translation updates
2013-11-08 22:24:04 +00:00
values-v11
Re-add theming, much better this time
2013-11-03 16:12:22 +01:00
values-zh-rCN
Translation updates
2013-11-08 16:42:53 +00:00
xml
Re-add theming, much better this time
2013-11-03 16:12:22 +01:00