Merge branch 'master' into ysy_upload_new

2017-01-12 17:55:00 +05:30
parent 96b2ff2eb6 53d0eac19a
commit 1f34b4fd91
46 changed files with 2660 additions and 1010 deletions
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item
+        android:id="@+id/action_planogram"
+        android:icon="@mipmap/star"
+        android:orderInCategory="100"
+        android:title="planogram"
+        app:showAsAction="always" />
+</menu>