Commit Graph

168 Commits

Author SHA1 Message Date
ashishandroid 95310c3375 dbclass1 2016-12-30 16:47:05 +05:30
YadavendraSinghYaduvanshi 0d750227f7 Merge branch 'master' into GeoT 2016-12-30 14:56:33 +05:30
Gagan290 fed55552f5 Merge branch 'master' of https://github.com/CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GSKORANGEV1 into Category_G
# Conflicts:
#	GSKMTOrange/src/main/AndroidManifest.xml
#	GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java
2016-12-30 13:39:07 +05:30
ashishandroid 7f24e8550f dbclass1 2016-12-30 13:25:54 +05:30
ashishandroid 64bae99b22 dbclass1 2016-12-30 13:02:52 +05:30
Gagan290 5641ee2d6a Merge branch 'master' of https://github.com/CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GSKORANGEV1 into Category_G
# Conflicts:
#	GSKMTOrange/src/main/AndroidManifest.xml
#	GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java
2016-12-30 09:42:54 +05:30
ashishandroid efa800ad43 dbclass1 2016-12-29 18:01:37 +05:30
Gagan290 b014ae3315 Merge branch 'master' of https://github.com/CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GSKORANGEV1 into Category_G
# Conflicts:
#	GSKMTOrange/src/main/AndroidManifest.xml
#	GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java
2016-12-29 16:39:41 +05:30
Gagan290 bc4ab85914 Merge branch 'master' of https://github.com/CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GSKORANGEV1 into Category_G
# Conflicts:
#	GSKMTOrange/src/main/AndroidManifest.xml
#	GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java
2016-12-29 14:43:28 +05:30
Gagan290 b39076fcf2 Merge branch 'master' of https://github.com/CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GSKORANGEV1 into Category_G
# Conflicts:
#	GSKMTOrange/src/main/AndroidManifest.xml
#	GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java
2016-12-29 12:35:18 +05:30
Gagan290 091900ac1e Merge branch 'GSkDownload' of https://github.com/CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GSKORANGEV1 into Category_G
# Conflicts:
#	GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java
2016-12-29 12:28:06 +05:30
Gagan290 fbd9780d0f Change 2016-12-29 12:15:47 +05:30
ashishandroid 132ec53d00 Merge branch 'GSkDownload' of https://github.com/CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GSKORANGEV1 into GeoT 2016-12-29 10:13:16 +05:30
Gagan290 1a810172d5 Change 2016-12-29 10:13:12 +05:30
ashishandroid 2c94c2fa1f Geotag 2016-12-29 10:12:23 +05:30
yadavendras 64bf024327 new download branch 2016-12-29 10:02:53 +05:30
yadavendras e3b31b92a2 new download branch 2016-12-27 13:13:43 +05:30
vinayvekkot-cpm 849533a02b Commit First New
Commit First New
2016-12-27 12:14:33 +05:30