Commit Graph

284 Commits

Author SHA1 Message Date
YadavendraSinghYaduvanshi b6cf62c87d Merge pull request #19 from CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/CategoryDownload
Category download
2017-01-05 16:32:13 +05:30
YadavendraSinghYaduvanshi 1a1a17e3bf Merge branch 'master' into CategoryDownload 2017-01-05 16:32:07 +05:30
yadavendras b6d31c43c0 Merge remote-tracking branch 'origin/CategoryDownload' into CategoryDownload 2017-01-05 16:08:31 +05:30
Gagan290 6b08d54536 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
2017-01-05 16:08:05 +05:30
yadavendras 8f8a30a007 new download branch 2017-01-05 16:07:29 +05:30
Gagan290 ade4954f45 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
2017-01-05 16:02:09 +05:30
Gagan290 25008a1aef 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
2017-01-05 15:26:15 +05:30
Gagan290 14ade63199 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
2017-01-05 15:24:31 +05:30
Gagan290 54072e8e94 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
2017-01-05 15:14:06 +05:30
Gagan290 309bce327a Merge branch 'master' of https://github.com/CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GSKORANGEV1 into Category_G 2017-01-05 13:44:02 +05:30
Gagan290 bf22b21820 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
2017-01-05 13:43:33 +05:30
YadavendraSinghYaduvanshi ad6f57668f Merge pull request #18 from CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/Category_G
Category g
2017-01-05 13:40:22 +05:30
YadavendraSinghYaduvanshi 358ce1fed4 Merge pull request #17 from CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GeoT
Merge remote-tracking branch 'origin/GeoT' into GeoT
2017-01-05 13:39:56 +05:30
Gagan290 738988a969 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
2017-01-05 13:26:08 +05:30
ashishandroid 5ce2628991 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-05 12:55:25 +05:30
YadavendraSinghYaduvanshi 4f849cfac8 Merge pull request #16 from CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GeoT
Geo t
2017-01-05 11:59:46 +05:30
YadavendraSinghYaduvanshi 4834af86d6 Merge branch 'master' into GeoT 2017-01-05 11:59:31 +05:30
Gagan290 9c86697333 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
2017-01-05 11:49:15 +05:30
ashishandroid fb8a08a5cb 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-05 10:52:09 +05:30
YadavendraSinghYaduvanshi e23089cfe2 Merge pull request #15 from CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/Category_G
Category g
2017-01-05 10:40:00 +05:30
Gagan290 8bb793e0f5 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
2017-01-05 10:35:22 +05:30
Gagan290 2f84b3ecea 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
2017-01-05 09:58:16 +05:30
YadavendraSinghYaduvanshi 4a9e9a58a0 Merge pull request #14 from CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/CategoryDownload
new download branch
2017-01-05 09:55:49 +05:30
YadavendraSinghYaduvanshi f4ff9e0a8e Merge branch 'master' into CategoryDownload 2017-01-05 09:55:42 +05:30
YadavendraSinghYaduvanshi a7e9190591 Merge pull request #13 from CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/Category_G
Category g
2017-01-05 09:51:53 +05:30
yadavendras 5a8151ecd4 new download branch 2017-01-05 09:46:53 +05:30
Gagan290 e0ed5b560e 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
2017-01-04 18:09:32 +05:30
Gagan290 097d48f345 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
2017-01-04 16:41:37 +05:30
Gagan290 18bd289c1d 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
2017-01-04 12:49:55 +05:30
ashishandroid 95310c3375 dbclass1 2016-12-30 16:47:05 +05:30
Gagan290 422da8a54c 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 15:37:40 +05:30
YadavendraSinghYaduvanshi 111987ea0f Merge pull request #12 from CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/CategoryDownload
new download branch
2016-12-30 15:32:48 +05:30
yadavendras 8d4ac80aae new download branch 2016-12-30 15:28:50 +05:30
YadavendraSinghYaduvanshi 7c5c7cf32d Merge pull request #11 from CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/CategoryDownload
Category download
2016-12-30 15:14:47 +05:30
yadavendras 0b0043f40f new download branch 2016-12-30 15:11:30 +05:30
YadavendraSinghYaduvanshi 15e1a3b6bc Merge pull request #10 from CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GeoT
Geo t
2016-12-30 14:56:40 +05:30
YadavendraSinghYaduvanshi 0d750227f7 Merge branch 'master' into GeoT 2016-12-30 14:56:33 +05:30
yadavendras c356ab9259 Merge branch 'master' of https://github.com/CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GSKORANGEV1 into CategoryDownload 2016-12-30 14:56:27 +05:30
Gagan290 065e43ea5b 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:42:13 +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
yadavendras 048d638120 Merge branch 'master' of https://github.com/CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GSKORANGEV1 into CategoryDownload 2016-12-30 11:55:04 +05:30
gagangoel290 5163c780bc Merge pull request #9 from CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/Category_G
Merge branch 'master' of https://github.com/CPM-INDIA-SALES-AND-MARKE…
2016-12-30 11:44:10 +05:30
Gagan290 9b1f2d5361 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 11:44:09 +05:30
gagangoel290 1ece4231eb Merge pull request #8 from CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/Category_G
Merge branch 'master' of https://github.com/CPM-INDIA-SALES-AND-MARKE…
2016-12-30 11:33:25 +05:30
yadavendras e89a45f022 Merge branches 'CategoryDownload' and 'master' of https://github.com/CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GSKORANGEV1 into CategoryDownload 2016-12-30 11:28:52 +05:30
Gagan290 64612e448a 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 11:28:45 +05:30
yadavendras 2be9a664c2 new download branch 2016-12-30 11:26:11 +05:30
gagangoel290 694d08b083 Merge pull request #7 from CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/Category_G
Category g
2016-12-30 10:33:23 +05:30