Merging code from tizen_3.0 branch 18/119418/1 submit/tizen/20170321.023724 tizen_4.0.m1_release
authorRahul Dadhich <r.dadhich@samsung.com>
Fri, 17 Mar 2017 02:24:35 +0000 (07:54 +0530)
committerRahul Dadhich <r.dadhich@samsung.com>
Fri, 17 Mar 2017 02:24:35 +0000 (07:54 +0530)
commit05f2b756af4292e046b427f7672163c323138cab
tree2eab2927841d5b91883d6cc0b7a024dae6d04539
parente527a8282e9a464024bb562759f21c7d2ba6e3b1
Merging code from tizen_3.0 branch

Change-Id: Id93bf72211d1d2be84abd9bd38521c7e24d858de
Signed-off-by: Rahul Dadhich <r.dadhich@samsung.com>
53 files changed:
CMakeLists.txt
inc/2dview/gl-albums-edit.h [moved from src/2dview/gl-albums-edit.h with 100% similarity]
inc/2dview/gl-albums-new.h [moved from src/2dview/gl-albums-new.h with 100% similarity]
inc/2dview/gl-albums-sel.h [moved from inc/features/gl-albums-sel.h with 95% similarity]
inc/2dview/gl-albums.h [moved from inc/features/gl-albums.h with 94% similarity]
inc/2dview/gl-thumbs-edit.h [moved from inc/features/gl-thumbs-edit.h with 100% similarity]
inc/2dview/gl-thumbs-sel.h [moved from inc/features/gl-thumbs-sel.h with 100% similarity]
inc/2dview/gl-thumbs.h [moved from inc/features/gl-thumbs.h with 100% similarity]
inc/2dview/gl-timeline.h [moved from src/2dview/gl-timeline.h with 96% similarity]
inc/data/gl-data-type.h
inc/data/gl-data-util.h
inc/features/gl-pinchzoom.h
inc/gallery.h
inc/util/gl-db-update.h
inc/util/gl-thread-util.h
inc/util/gl-util.h
project_def.prop
res/po/POTFILES.in
src/2dview/gl-albums-edit.c
src/2dview/gl-albums-new.c
src/2dview/gl-albums-sel.c [moved from src/features/gl-albums-sel.c with 97% similarity]
src/2dview/gl-albums.c [moved from src/features/gl-albums.c with 97% similarity]
src/2dview/gl-thumbs-edit.c [moved from src/features/gl-thumbs-edit.c with 97% similarity]
src/2dview/gl-thumbs-sel.c [moved from src/features/gl-thumbs-sel.c with 99% similarity]
src/2dview/gl-thumbs.c [moved from src/features/gl-thumbs.c with 98% similarity]
src/2dview/gl-timeline.c
src/data/gl-data-util.c
src/data/gl-data.c
src/data/gl-local-data.c
src/features/gl-entry.c
src/features/gl-main.c
src/features/gl-pinchzoom.c
src/gallery.c
src/util/gl-db-update.c
src/util/gl-debug.c
src/util/gl-ext-ug-load.c
src/util/gl-fs.c
src/util/gl-lang.c
src/util/gl-thread-util.c
src/util/gl-ui-util.c
src/util/gl-util.c
src/widget/gl-button.c
src/widget/gl-controlbar.c
src/widget/gl-ctxpopup.c
src/widget/gl-editfield.c
src/widget/gl-gesture.c
src/widget/gl-nocontents.c
src/widget/gl-notify.c
src/widget/gl-popup.c
src/widget/gl-progressbar.c
src/widget/gl-rotate-bg.c
src/widget/gl-thumb.c
src/widget/gl-tile.c