Commit Graph

9 Commits

Author SHA1 Message Date
ashishandroid 4bbc524824 review 2017-02-02 15:52:49 +05:30
ashishandroid 5b3b47dc1e newcode 2017-01-21 16:10:23 +05:30
ashishandroid 370fc8127a newcode 2017-01-17 17:58:09 +05:30
ashishandroid 3a127934cc newcode 2017-01-13 17:03:18 +05:30
ashishandroid 88eff88838 newcode 2017-01-12 18:40:18 +05:30
ashishandroid 35878c7d51 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-11 12:13:08 +05:30
ashishandroid 5c3b06496f 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-10 16:13:48 +05:30
ashishandroid a95bf5cddd 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-09 18:13:27 +05:30
ashishandroid 83e6be733b 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-06 11:42:14 +05:30