Philipp Schaefer ab164cfde5 Merge branch 'intents' of git://github.com/fkloft/ingress-intel-total-conversion into fkloft-intents ...

Conflicts:
	mobile/res/values/strings.xml

2013-07-27 11:23:51 +02:00

..

dimens.xml

Use activity instead of dialog

2013-07-26 19:13:25 +02:00

strings.xml

Merge branch 'intents' of git://github.com/fkloft/ingress-intel-total-conversion into fkloft-intents

2013-07-27 11:23:51 +02:00

styles.xml

set default theme to holo

2013-03-29 13:55:46 +01:00