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

Browse Source

Conflicts:
	mobile/res/values/strings.xml

...

This commit is contained in:

Philipp Schaefer

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

parent c4b289f564 fa4d4c64f7

commit ab164cfde5

24 changed files with 547 additions and 29 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

BIN

mobile/res/drawable-xhdpi/browser.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.2 KiB

BIN

mobile/res/drawable-xhdpi/copy.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.4 KiB

BIN

mobile/res/drawable-xhdpi/share.png Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.7 KiB