merge from master
authorJisung Ahn <jcastle.ahn@samsung.com>
Fri, 14 Dec 2012 10:25:34 +0000 (19:25 +0900)
committerJisung Ahn <jcastle.ahn@samsung.com>
Fri, 14 Dec 2012 10:25:34 +0000 (19:25 +0900)
commit33cb21ee882de2e7ec53213e16dee431b5bd55ed
tree8d06bba3312f0dc7823d8d1326ce56915f72d91a
parentce07e02441958cef25b7cd2c341113787fee7ac2
merge from master

Change-Id: I79bb9c047cdae8a446887f64652e11d462f568b8
23 files changed:
common/include/ivug-db.h [changed mode: 0644->0755]
common/include/ivug-util.h [changed mode: 0644->0755]
common/src/ivug-db.c [changed mode: 0644->0755]
common/src/ivug-util.c
include/ivug-define.h
main/layout/ivug-crop-view.edc [changed mode: 0644->0755]
main/src/control/ivug-crop-ug.cpp [changed mode: 0644->0755]
main/src/control/ivug-crop-ug.h [changed mode: 0644->0755]
main/src/control/ivug-parameter.c
main/src/include/ivug-common.h [changed mode: 0644->0755]
main/src/include/ivug-crop-view.h [changed mode: 0644->0755]
main/src/slider/ivug-slider.cpp
main/src/ug-image-viewer.cpp
main/src/view/ivug-crop-view.cpp
main/src/view/ivug-main-view-menu.cpp
main/src/view/ivug-main-view-toolbar.cpp
main/src/view/ivug-name-view.c
main/src/view/ivug-setas-view.c
medialist/include/ivug-media.h
medialist/include/ivug-medialist.h [changed mode: 0644->0755]
medialist/src/ivug-mediadata.c
medialist/src/ivug-medialist.c [changed mode: 0644->0755]
res/include/ivug-string.h