[ABS] Merge branch 'tizen_4.0' into tizen accepted/tizen/unified/20180403.182428 submit/tizen_mobile_tpk/20180402.130428
authorVikas Agrawal <vikas.ag@samsung.com>
Mon, 2 Apr 2018 13:11:59 +0000 (22:11 +0900)
committerVikas Agrawal <vikas.ag@samsung.com>
Mon, 2 Apr 2018 13:11:59 +0000 (22:11 +0900)
Conflicts:
src/common/file-operation/mf-request.c
src/common/file-system/mf-file-attr.c
src/common/mf-callback.c
src/common/mf-detail.c
src/common/mf-file-util.c
src/common/mf-fm-svc-wrapper.c
src/common/mf-launch.c
src/common/mf-media-content.c
src/common/mf-otg.c
src/common/mf-storage-space.c
src/common/mf-ug-detail-fs.c
src/common/mf-util.c
src/media-db/mf-media-db.c
src/media-db/mf-media.c
src/mf-main.c
src/thumbnail/mf-thumb-gen.c
src/widget/mf-category-view.c
src/widget/mf-detail-view.c
src/widget/mf-edit-view.c
src/widget/mf-gengrid.c
src/widget/mf-genlist.c
src/widget/mf-navi-bar.c
src/widget/mf-object-item.c
src/widget/mf-object.c
src/widget/mf-popup.c
src/widget/mf-root-view.c
src/widget/mf-search-bar.c
src/widget/mf-search-view.c
src/widget/mf-tray-item.c
src/widget/mf-view.c

Reference: submit/tizen/20180402.130428
Commit id: 02bb4aa37a100ed64cc7b1182212a8c5f5a504f7
Requested by: vikas.ag@samsung.com
SDK rootstrap version: 20180402_1

org.tizen.myfile-1.0.0-arm-debug.tpk
org.tizen.myfile-1.0.0-arm.tpk
org.tizen.myfile-1.0.0-x86-debug.tpk
org.tizen.myfile-1.0.0-x86.tpk
packaging/org.tizen.myfile.spec

index 61a8688..b9fff63 100644 (file)
Binary files a/org.tizen.myfile-1.0.0-arm-debug.tpk and b/org.tizen.myfile-1.0.0-arm-debug.tpk differ
index 5b8048e..6fe387a 100644 (file)
Binary files a/org.tizen.myfile-1.0.0-arm.tpk and b/org.tizen.myfile-1.0.0-arm.tpk differ
index 1868834..f79f5b0 100644 (file)
Binary files a/org.tizen.myfile-1.0.0-x86-debug.tpk and b/org.tizen.myfile-1.0.0-x86-debug.tpk differ
index 398cb20..f46bf97 100644 (file)
Binary files a/org.tizen.myfile-1.0.0-x86.tpk and b/org.tizen.myfile-1.0.0-x86.tpk differ
index 46742dc..39e09dc 100644 (file)
@@ -1,6 +1,6 @@
 Name:       org.tizen.myfile
 #VCS_FROM:   profile/mobile/apps/native/myfiles#02bb4aa37a100ed64cc7b1182212a8c5f5a504f7
-#RS_Ver:    20180328_4 
+#RS_Ver:    20180402_1 
 Summary:    Myfile Application v1.0
 Version:    1.0.0
 Release:    1