 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 |
|
|
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
|
abc62c526d
|
Merge branch 'master' into T2P_save_Y
|
2017-01-09 15:57:17 +05:30 |
|
|
yadavendras
|
06ee7edb6f
|
upload module added
|
2017-01-09 15:50:47 +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 |
|
|
Yadavendra
|
8d591f86d4
|
T2p whole data done
|
2017-01-08 22:54:52 +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 |
|
|
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 |
|
|
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
|
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
|
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 |
|
|
YadavendraSinghYaduvanshi
|
fc308265ca
|
Merge branch 'master' into Category_G
|
2017-01-05 16:55:25 +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 |
|
|
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 |
|
|
YadavendraSinghYaduvanshi
|
4834af86d6
|
Merge branch 'master' into GeoT
|
2017-01-05 11:59:31 +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
|
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
|
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 |
|
|
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 |
|