merge master
authorJisung Ahn <jcastle.ahn@samsung.com>
Fri, 28 Dec 2012 04:29:44 +0000 (13:29 +0900)
committerJisung Ahn <jcastle.ahn@samsung.com>
Fri, 28 Dec 2012 07:30:05 +0000 (16:30 +0900)
commit5c275633a1cfcbf61f0b23b0d6aa9faec0c99d43
treec030e58e253fb82f5e48fa98a42680ab925831cf
parentd7477c128fd9c710e99457431a22895470b74049
merge master

Change-Id: Iedf21e9c047c416f562bf647b67e4004f7e634fa
32 files changed:
common/src/ivug-db.c
main/layout/ivug-crop-view.edc
main/layout/ivug-setas.edc
main/res/images/01_Control icon/00_winset_btn_prev.png [deleted file]
main/res/images/01_Control icon/01_controlbar_icon_trim.png [deleted file]
main/res/images/01_Control icon/01_controllbar_icon_close.png [deleted file]
main/res/images/01_Control icon/T01_1_controlbar_icon_Rotate left.png [deleted file]
main/res/images/01_Control icon/T01_1_controlbar_icon_Rotate right.png [deleted file]
main/res/images/01_Control icon/T01_1_controlbar_icon_detail.png [deleted file]
main/res/images/01_Control icon/T01_1_title_icon_device.png [deleted file]
main/res/images/01_Control icon/T01_1_title_icon_set_as.png [deleted file]
main/res/images/01_Control icon/T01_Option tray_Edit.png [deleted file]
main/res/images/01_Control icon/T01_Title_icon_more.png [deleted file]
main/res/images/01_Control icon/T01_controlbar_icon_add.png [deleted file]
main/res/images/01_Control icon/T01_controlbar_icon_addtag.png [deleted file]
main/res/images/01_Control icon/T01_controlbar_icon_delete.png [deleted file]
main/res/images/01_Control icon/T01_controlbar_icon_save.png [deleted file]
main/res/images/01_Control icon/T01_controlbar_icon_share.png [deleted file]
main/res/images/01_Control icon/T01_controlbar_icon_slideshow.png [deleted file]
main/src/control/ivug-parameter.c
main/src/include/ivug-main-view.h
main/src/include/ivug-slideshow-view.h [changed mode: 0644->0755]
main/src/slider/ivug-slider-item.cpp
main/src/view/ivug-crop-view.cpp
main/src/view/ivug-details-view.c
main/src/view/ivug-main-view-toolbar.cpp
main/src/view/ivug-main-view.cpp
main/src/view/ivug-name-view.c
main/src/view/ivug-setas-view-callerid.cpp
main/src/view/ivug-setas-view-wallpaper.cpp
main/src/view/ivug-slideshow-view.cpp
medialist/src/ivug-data-list.h [changed mode: 0644->0755]