Commit Graph

13 Commits

Author SHA1 Message Date
Gagan290 883f51ab20 turkish 2017-03-24 22:38:09 +05:30
Gagan290 7d48dc25ae turkish 2017-03-24 18:13:34 +05:30
YadavendraSinghYaduvanshi 33f6dbb65f Merge branch 'master' into GG_T2P_Add_Camera 2017-02-01 13:43:16 +05:30
yadavendras 033f55adbc Merge branch 'master' of https://github.com/CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GSKORANGEV1 into ysy_turk
# Conflicts:
#	GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java
2017-02-01 12:22:19 +05:30
Gagan290 f86f832b61 //Stock_FacingActivity Changes today 2017-01-31 18:01:49 +05:30
yadavendras c5efee08d6 Merge branch 'master' of https://github.com/CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GSKORANGEV1 into ysy_turk
# Conflicts:
#	GSKMTOrange/src/main/java/cpm/com/gskmtorange/Database/GSKOrangeDB.java
2017-01-24 17:28:56 +05:30
yadavendras 2f684cf426 T2P upload data newss 2017-01-17 13:49:27 +05:30
ashishandroid eb891ffc70 newcode 2017-01-13 19:09:40 +05:30
yadavendras 385bd0a36d T2P upload data newss 2017-01-13 17:58:49 +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
ashishandroid efa800ad43 dbclass1 2016-12-29 18:01:37 +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