Merge remote-tracking branch 'origin/GeoT' into GeoT

Browse Source

# Conflicts:
#	GSKMTOrange/src/main/AndroidManifest.xml
#	GSKMTOrange/src/main/java/cpm/com/gskmtorange/GeoTag/GeoTagActivity.java

...

This commit is contained in:

ashishandroid

2017-01-05 10:52:09 +05:30

parent 95310c3375 0d750227f7

commit fb8a08a5cb

76 changed files with 7730 additions and 449 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

GSKMTOrange/src/main/res/mipmap-xhdpi/tick_d.png

BIN

Binary file not shown.

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