merge with master
authorJinkun Jang <jinkun.jang@samsung.com>
Fri, 15 Mar 2013 16:04:21 +0000 (01:04 +0900)
committerJinkun Jang <jinkun.jang@samsung.com>
Fri, 15 Mar 2013 16:04:21 +0000 (01:04 +0900)
commit0fb829505292ade55df961779afdbf7e2adbbcd8
tree80caabddb49432171f8726ec96a305eccb7b9e7a
parent788c17380d55d44767097eb4e07e903bbf9e37c0
merge with master
59 files changed:
NOTICE [moved from NOTICE.Flora with 65% similarity]
data/CMakeLists.txt
data/edc_common.h
data/icon/myfile_icon_category_bg.png [deleted file]
data/icon/myfile_icon_category_bg_press.png [deleted file]
data/icon/myfile_icon_category_document.png [deleted file]
data/icon/myfile_icon_category_document_press.png [deleted file]
data/icon/myfile_icon_category_image.png [deleted file]
data/icon/myfile_icon_category_image_press.png [deleted file]
data/icon/myfile_icon_category_others.png [deleted file]
data/icon/myfile_icon_category_others_press.png [deleted file]
data/icon/myfile_icon_category_sounds.png [deleted file]
data/icon/myfile_icon_category_sounds_press.png [deleted file]
data/icon/myfile_icon_category_video.png [deleted file]
data/icon/myfile_icon_category_video_press.png [deleted file]
data/icon/myfile_icon_control_pause.png [deleted file]
data/icon/myfile_icon_shortcut_default_corner.png [new file with mode: 0644]
data/icon/myfile_icon_shortcut_document.png [new file with mode: 0644]
data/icon/myfile_icon_shortcut_document_press.png [new file with mode: 0644]
data/icon/myfile_icon_shortcut_image.png [new file with mode: 0644]
data/icon/myfile_icon_shortcut_image_press.png [new file with mode: 0644]
data/icon/myfile_icon_shortcut_others.png [new file with mode: 0644]
data/icon/myfile_icon_shortcut_others_press.png [new file with mode: 0644]
data/icon/myfile_icon_shortcut_sound.png [new file with mode: 0644]
data/icon/myfile_icon_shortcut_sound_press.png [new file with mode: 0644]
data/icon/myfile_icon_shortcut_video.png [new file with mode: 0644]
data/icon/myfile_icon_shortcut_video_press.png [new file with mode: 0644]
data/image/myfile_icon_shortcut_default_corner.png [new file with mode: 0644]
data/myfile.edc
data/po/CMakeLists.txt
packaging/org.tizen.myfile.spec [changed mode: 0755->0644]
src/common/file-system/mf-file-attr.c
src/common/mf-callback.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-share.c
src/common/mf-util.c
src/include/mf-callback.h
src/include/mf-dlog.h
src/include/mf-fm-svc-wrapper.h
src/include/mf-fs-util.h
src/include/mf-gengrid.h
src/include/mf-main.h
src/include/mf-resource.h
src/include/mf-tray-item.h
src/include/mf-util.h
src/include/mf-widget.h
src/mf-main.c
src/widget/mf-context-popup.c
src/widget/mf-gengrid.c
src/widget/mf-genlist.c
src/widget/mf-navi-bar.c
src/widget/mf-popup.c
src/widget/mf-search-bar.c
src/widget/mf-split-view.c
src/widget/mf-tray-item.c
src/widget/mf-widget.c