ashishandroid 1260f47b0d Merge remote-tracking branch 'origin/GeoT' into GeoT ...

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

2017-01-07 09:42:10 +05:30

..

copyright

Commit First New

2016-12-27 12:14:33 +05:30

compiler.xml

Commit First New

2016-12-27 12:14:33 +05:30

gradle.xml

dbclass1

2016-12-29 18:01:37 +05:30

misc.xml

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

2017-01-07 09:42:10 +05:30

modules.xml

new download branch

2016-12-27 13:13:43 +05:30

runConfigurations.xml

Commit First New

2016-12-27 12:14:33 +05:30

vcs.xml

Commit First New

2016-12-27 12:14:33 +05:30