 Gagan290
|
084cfd7b70
|
Merge branch 'master' of https://github.com/CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GSKORANGEV1 into GG_Update_Manifest
# Conflicts:
# GSKMTOrange/src/main/AndroidManifest.xml
|
2017-01-10 17:43:29 +05:30 |
|
|
Gagan290
|
05c199dddd
|
Merge branch 'master' of https://github.com/CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GSKORANGEV1 into GG_Update_Manifest
# Conflicts:
# GSKMTOrange/src/main/AndroidManifest.xml
|
2017-01-10 16:31:51 +05:30 |
|
|
Gagan290
|
c9a7aeed86
|
Merge branch 'master' of https://github.com/CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GSKORANGEV1 into GG_Update_Manifest
# Conflicts:
# GSKMTOrange/src/main/AndroidManifest.xml
|
2017-01-09 18:13:14 +05:30 |
|
|
Gagan290
|
5d6f153018
|
Merge branch 'master' of https://github.com/CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GSKORANGEV1 into GG_Update_Manifest
# Conflicts:
# GSKMTOrange/src/main/AndroidManifest.xml
|
2017-01-09 18:11:20 +05:30 |
|
|
Gagan290
|
362f3ed0a3
|
Merge branch 'master' of https://github.com/CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GSKORANGEV1 into GG_Update_Manifest
# Conflicts:
# GSKMTOrange/src/main/AndroidManifest.xml
|
2017-01-09 16:37:14 +05:30 |
|
|
Gagan290
|
f03119e0ae
|
Icons
|
2017-01-09 16:29:10 +05:30 |
|
|
YadavendraSinghYaduvanshi
|
d8b4050c9a
|
Merge pull request #26 from CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/T2P_save_Y
T2 p save y
|
2017-01-09 15:57:24 +05:30 |
|
|
YadavendraSinghYaduvanshi
|
abc62c526d
|
Merge branch 'master' into T2P_save_Y
|
2017-01-09 15:57:17 +05:30 |
|
|
yadavendras
|
14402ff867
|
upload module added
|
2017-01-09 15:53:11 +05:30 |
|
|
yadavendras
|
06ee7edb6f
|
upload module added
|
2017-01-09 15:50:47 +05:30 |
|
|
Gagan290
|
f4b812d965
|
Icons
|
2017-01-09 15:45:26 +05:30 |
|
|
Gagan290
|
6fd647418e
|
Icons
|
2017-01-09 13:52:22 +05:30 |
|
|
YadavendraSinghYaduvanshi
|
400ac39b4f
|
Merge pull request #25 from CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GG_Promo_Update
Gg promo update
|
2017-01-09 13:50:38 +05:30 |
|
|
Gagan290
|
e2d02196c8
|
Icons
|
2017-01-09 13:30:29 +05:30 |
|
|
Gagan290
|
0c30da48e7
|
Icons
|
2017-01-09 12:30:14 +05:30 |
|
|
Gagan290
|
e6b6c607b5
|
Icons
|
2017-01-09 11:08:00 +05:30 |
|
|
Gagan290
|
5020354048
|
Icons
|
2017-01-09 11:06:53 +05:30 |
|
|
Gagan290
|
e277251a99
|
Icons
|
2017-01-09 10:38:42 +05:30 |
|
|
YadavendraSinghYaduvanshi
|
18bbb1f1a0
|
Merge pull request #24 from CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/t2p_Y
T2p whole data done
|
2017-01-08 22:57:00 +05:30 |
|
|
Yadavendra
|
8d591f86d4
|
T2p whole data done
|
2017-01-08 22:54:52 +05:30 |
|
|
YadavendraSinghYaduvanshi
|
ce50f43d13
|
Merge pull request #23 from CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/Gagan
Gagan
|
2017-01-07 18:21:16 +05:30 |
|
|
YadavendraSinghYaduvanshi
|
c38968aadf
|
Merge branch 'master' into Gagan
|
2017-01-07 18:21:01 +05:30 |
|
|
Gagan Goel
|
41bf63fd15
|
//New Change
|
2017-01-07 10:10:50 +05:30 |
|
|
Gagan Goel
|
9e285c92a4
|
//New Change
|
2017-01-07 10:07:39 +05:30 |
|
|
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 |
|
|
ashishandroid
|
e0a454f161
|
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:25:32 +05:30 |
|
|
Gagan290
|
68a9750eba
|
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-06 18:38:27 +05:30 |
|
|
Gagan290
|
d983df4d7f
|
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-06 18:32:24 +05:30 |
|
|
Gagan290
|
f679929c47
|
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-06 18:31:44 +05:30 |
|
|
Gagan290
|
6f4596b060
|
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-06 18:20:43 +05:30 |
|
|
Gagan290
|
b22eb58f64
|
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-06 18:18:24 +05:30 |
|
|
Gagan290
|
161804e602
|
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-06 18:10:32 +05:30 |
|
|
Gagan290
|
e1edc5c8bc
|
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-06 17:53:28 +05:30 |
|
|
Gagan290
|
6807b45dbb
|
Merge remote-tracking branch 'origin/Category_G' into Category_G
|
2017-01-06 17:53:02 +05:30 |
|
|
Gagan290
|
04875b6fc8
|
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-06 17:52:25 +05:30 |
|
|
YadavendraSinghYaduvanshi
|
368b478705
|
Merge pull request #21 from CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GeoT
Geo t
|
2017-01-06 12:00:04 +05:30 |
|
|
YadavendraSinghYaduvanshi
|
1e2d4973b4
|
Merge branch 'master' into GeoT
|
2017-01-06 11:59:56 +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 |
|
|
ashishandroid
|
852c6f61e5
|
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:36:36 +05:30 |
|
|
YadavendraSinghYaduvanshi
|
0f3633f6f6
|
Merge pull request #20 from CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/Category_G
Category g
|
2017-01-05 16:55:34 +05:30 |
|
|
YadavendraSinghYaduvanshi
|
fc308265ca
|
Merge branch 'master' into Category_G
|
2017-01-05 16:55:25 +05:30 |
|
|
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 |
|