Peter Serwylo 3731ed8f23 Merge remote-tracking branch 'upstream/master' into improvement/16/manage-repos ...

Conflicts:
	res/values/strings.xml
	src/org/fdroid/fdroid/DB.java
	src/org/fdroid/fdroid/ManageRepo.java
	src/org/fdroid/fdroid/RepoXMLHandler.java
	src/org/fdroid/fdroid/Utils.java

2014-01-04 20:45:52 +11:00

..

array.xml

Move a few values to no_trans.xml

2013-11-08 07:51:25 +00:00

colors.xml

WIP: implementing context and action bar menus for repo management.

2013-12-05 13:04:33 +11:00

default_repo.xml

Add name and description to repo, bump DB to v21

2013-05-28 08:58:36 +02:00

dimen.xml

Do paddings for the icon and not the whole applist item

2014-01-01 17:09:01 +01:00

dimens.xml

WIP: implementing context and action bar menus for repo management.

2013-12-05 13:04:33 +11:00

ids.xml

Gives category Spinner an ID

2012-09-16 10:08:30 +01:00

no_trans.xml

Add basic dogecoin donation support

2013-12-31 12:11:03 +01:00

strings.xml

Merge remote-tracking branch 'upstream/master' into improvement/16/manage-repos

2014-01-04 20:45:52 +11:00

styles.xml

add fingerprint field to Add Repo dialog, and alert if repo already exists

2013-11-20 00:06:12 -05:00