Commit Graph

31 Commits

Author SHA1 Message Date
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
ashishchauhan009 4fa554a606 Merge pull request #6 from CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GeoT
Geo t
2016-12-29 18:07:07 +05:30
ashishchauhan009 a4b2a4644b Merge branch 'master' into GeoT 2016-12-29 18:06:57 +05:30
ashishandroid 115aee9780 Merge remote-tracking branch 'origin/GeoT' into GeoT 2016-12-29 18:04:54 +05:30
ashishandroid efa800ad43 dbclass1 2016-12-29 18:01:37 +05:30
ashishandroid 04cfeba6ef dbclass1 2016-12-29 17:58:39 +05:30
Gagan290 aef06881e3 Merge branch 'master' of https://github.com/CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GSKORANGEV1 into Category_G 2016-12-29 16:55:32 +05:30
YadavendraSinghYaduvanshi 1a07ba9d90 Merge pull request #5 from CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/CategoryDownload
new download branch
2016-12-29 16:51:28 +05:30
yadavendras d95aff3860 new download branch 2016-12-29 16:43:52 +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 22e94b0e88 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 15:32:53 +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 2c077f5c3d 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:46 +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 9032e49892 Change 2016-12-29 12:18:45 +05:30
Gagan290 fbd9780d0f Change 2016-12-29 12:15:47 +05:30
YadavendraSinghYaduvanshi 0406008673 Merge pull request #4 from CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GeoT
Geo t
2016-12-29 12:13:25 +05:30
YadavendraSinghYaduvanshi 2fdab55f98 Merge branch 'master' into GeoT 2016-12-29 12:13:08 +05:30
ashishandroid 224a2db5b3 dbclass 2016-12-29 12:06:10 +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
YadavendraSinghYaduvanshi 5e7c193560 Merge pull request #3 from CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GSkDownload
GSkDownload
2016-12-29 10:07:25 +05:30
yadavendras 64bf024327 new download branch 2016-12-29 10:02:53 +05:30
Gagan290 fa8130ce58 Change 2016-12-27 17:54:12 +05:30
YadavendraSinghYaduvanshi 4f74057b53 Merge pull request #2 from CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GeotagA
GeotagA
2016-12-27 13:38:51 +05:30
ashishandroid 0e1d6611d4 1st
geotag
2016-12-27 13:23:26 +05:30
YadavendraSinghYaduvanshi 7b0c9e8353 Merge pull request #1 from CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GSkDownload
new download branch
2016-12-27 13:20:05 +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