Gagan290 9384adeec3 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-12 12:04:18 +05:30

..

activity_auto_update.xml

Commit First New

2016-12-27 12:14:33 +05:30

activity_category_list.xml

Merge branch 'master' of https://github.com/CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GSKORANGEV1 into Category_G

2017-01-06 17:52:25 +05:30

activity_category_wise_performance.xml

Merge branch 'master' of https://github.com/CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GSKORANGEV1 into Category_G

2017-01-06 17:52:25 +05:30

activity_daily_data_menu.xml

Merge branch 'master' of https://github.com/CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GSKORANGEV1 into Category_G

2017-01-06 17:52:25 +05:30

activity_download.xml

new download branch

2016-12-27 13:13:43 +05:30

activity_geo_tag.xml

Merge remote-tracking branch 'origin/GeoT' into GeoT

2017-01-05 10:52:09 +05:30

activity_login.xml

Commit First New

2016-12-27 12:14:33 +05:30

activity_main.xml

Merge branch 'master' of https://github.com/CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GSKORANGEV1 into Category_G

2017-01-04 12:49:55 +05:30

activity_msl__availability.xml

Merge branch 'master' of https://github.com/CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GSKORANGEV1 into Category_G

2017-01-06 17:52:25 +05:30

activity_promo_compliance.xml

Merge branch 'master' of https://github.com/CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GSKORANGEV1 into Category_G

2017-01-06 17:52:25 +05:30

activity_select_language.xml

Commit First New

2016-12-27 12:14:33 +05:30

activity_splash_screen.xml

Commit First New

2016-12-27 12:14:33 +05:30

activity_stock_facing.xml

Merge branch 'master' of https://github.com/CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GSKORANGEV1 into Category_G

2017-01-06 17:52:25 +05:30

activity_store_wise_performance.xml

Merge branch 'master' of https://github.com/CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GSKORANGEV1 into GG_Update_Manifest

2017-01-11 18:04:08 +05:30

activity_storeimage.xml

Merge remote-tracking branch 'origin/GeoT' into GeoT

2017-01-05 10:52:09 +05:30

activity_t2_pcompliance.xml

new download branch

2017-01-05 09:46:53 +05:30

activity_upload.xml

upload module added

2017-01-09 15:50:47 +05:30

additionaldialoglayout.xml

Merge remote-tracking branch 'origin/GeoT' into GeoT

2017-01-09 18:13:27 +05:30

additionallistlayout.xml

Merge remote-tracking branch 'origin/GeoT' into GeoT

2017-01-10 16:13:48 +05:30

additionalvisibilitydialoglayout.xml

newcode

2017-01-11 12:52:10 +05:30

additionalvisibilitylayout.xml

Merge remote-tracking branch 'origin/GeoT' into GeoT

2017-01-10 16:13:48 +05:30

app_bar_main.xml

Merge branch 'master' of https://github.com/CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GSKORANGEV1 into Category_G

2017-01-04 12:49:55 +05:30

category_menu_row.xml

Change

2016-12-29 10:13:12 +05:30

content_category_list.xml

Icons

2017-01-09 16:29:10 +05:30

content_category_wise_performance.xml

Merge branch 'master' of https://github.com/CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GSKORANGEV1 into GG_Update_Manifest

2017-01-11 18:04:08 +05:30

content_daily_main_menu.xml

Icons

2017-01-09 16:29:10 +05:30

content_geo_tag.xml

Merge remote-tracking branch 'origin/GeoT' into GeoT

2017-01-05 10:52:09 +05:30

content_main.xml

Commit First New

2016-12-27 12:14:33 +05:30

content_msl__availability.xml

Icons

2017-01-09 16:29:10 +05:30

content_promo_compliance.xml

Merge branch 'master' of https://github.com/CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GSKORANGEV1 into GG_Update_Manifest

2017-01-11 11:32:59 +05:30

content_select_language.xml

Commit First New

2016-12-27 12:14:33 +05:30

content_stock_facing.xml

Icons

2017-01-09 16:29:10 +05:30

content_store_wise_performance.xml

Merge branch 'master' of https://github.com/CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GSKORANGEV1 into GG_Update_Manifest

2017-01-11 18:04:08 +05:30

content_t2_pcompliance.xml

new download branch

2017-01-05 09:46:53 +05:30

contentadditionalvisibility.xml

Merge remote-tracking branch 'origin/GeoT' into GeoT

2017-01-11 12:13:08 +05:30

contentstoreimage.xml

Merge remote-tracking branch 'origin/GeoT' into GeoT

2017-01-05 10:52:09 +05:30

custom_dialog_progress.xml

new download branch

2016-12-29 10:02:53 +05:30

custom_language_dialog.xml

Commit First New

2016-12-27 12:14:33 +05:30

custom_layout.xml

Commit First New

2016-12-27 12:14:33 +05:30

custom_spinner_item.xml

Merge branch 'master' into Additional

2017-01-10 18:29:27 +05:30

custom.xml

Merge branch 'master' of https://github.com/CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GSKORANGEV1 into GG_Update_Manifest

2017-01-10 16:31:51 +05:30

daily_main_menu_row.xml

Change

2016-12-29 10:13:12 +05:30

dialogbox.xml

Merge remote-tracking branch 'origin/GeoT' into GeoT

2017-01-05 10:52:09 +05:30

gap_checklist_item.xml

T2P insert update complete

2017-01-11 16:49:36 +05:30

gaps_dialog_layout.xml

new download branch

2017-01-05 16:07:29 +05:30

geotagstorelist.xml

Merge remote-tracking branch 'origin/GeoT' into GeoT

2017-01-05 10:52:09 +05:30

geotagstorelistfab.xml

Merge remote-tracking branch 'origin/GeoT' into GeoT

2017-01-07 09:42:10 +05:30

item_additional_promo_list.xml

Icons

2017-01-09 13:30:29 +05:30

item_category_wise_performance.xml

Merge branch 'master' of https://github.com/CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GSKORANGEV1 into GG_Update_Manifest

2017-01-11 18:04:08 +05:30

item_msl_availability_child.xml

Merge branch 'master' of https://github.com/CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GSKORANGEV1 into GG_Update_Manifest

2017-01-11 11:32:59 +05:30

item_msl_availability_header.xml

Change

2016-12-29 12:15:47 +05:30

item_promo_sku_list.xml

Merge branch 'master' of https://github.com/CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GSKORANGEV1 into GG_Update_Manifest

2017-01-11 11:32:59 +05:30

item_stock_facing_child.xml

Merge branch 'master' of https://github.com/CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GSKORANGEV1 into GG_Update_Manifest

2017-01-10 18:15:48 +05:30

item_stock_facing_header.xml

Merge branch 'master' of https://github.com/CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GSKORANGEV1 into GG_Update_Manifest

2017-01-12 12:04:18 +05:30

item_store_wise_performance.xml

Merge branch 'master' of https://github.com/CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GSKORANGEV1 into GG_Update_Manifest

2017-01-11 18:04:08 +05:30

nav_header_main.xml

Commit First New

2016-12-27 12:14:33 +05:30

nonworking.xml

Merge remote-tracking branch 'origin/GeoT' into GeoT

2017-01-07 09:42:10 +05:30

sku_added_item_layout.xml

T2p whole data done

2017-01-08 22:54:52 +05:30

storelist.xml

Merge remote-tracking branch 'origin/GeoT' into GeoT

2017-01-07 09:42:10 +05:30

storelistfablayout.xml

Merge remote-tracking branch 'origin/GeoT' into GeoT

2017-01-07 09:42:10 +05:30

storelistlayout.xml

Merge remote-tracking branch 'origin/GeoT' into GeoT

2017-01-07 09:42:10 +05:30

storeviewlist.xml

Merge remote-tracking branch 'origin/GeoT' into GeoT

2017-01-05 10:52:09 +05:30

t2p_item_layout.xml

T2P insert update complete

2017-01-11 16:49:36 +05:30

t2p_sku_dialog_layout.xml

T2P insert update complete

2017-01-11 16:49:36 +05:30