merge from private
authorJisung Ahn <jcastle.ahn@samsung.com>
Fri, 21 Dec 2012 04:29:52 +0000 (13:29 +0900)
committerJisung Ahn <jcastle.ahn@samsung.com>
Fri, 21 Dec 2012 04:29:52 +0000 (13:29 +0900)
commit221433dca3a92d09e1139d6e999e14f82a42282e
tree52e399a880e2bb8638693a0b91db27139e18bbcb
parentc2df3ff5446a22c18b1f034e1bd5d747f3bf4c1e
merge from private

Change-Id: I4e5b8981c0dfec031d035632d636edf48752e333
73 files changed:
common/include/ivug-db.h
include/ivug-define.h
main/layout/ivug-crop-view.edc
main/layout/ivug-main.edc
main/layout/ivug-naviframe.edc [changed mode: 0644->0755]
main/layout/ivug-setas.edc [changed mode: 0644->0755]
main/layout/ivug-slider.edc [changed mode: 0644->0755]
main/layout/ivug-theme.edc [changed mode: 0644->0755]
main/src/control/ivug-popup.c [changed mode: 0644->0755]
main/src/include/ivug-crop-view.h
main/src/include/ivug-main-view.h
main/src/include/ivug-name-view.h [changed mode: 0644->0755]
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-slideshow-view.cpp
medialist/include/ivug-filter.h [changed mode: 0644->0755]
medialist/src/ivug-filter.c
medialist/src/ivug-mediadata.c
medialist/src/ivug-medialist.c
res/include/ivug-string.h
res/po/ar.po [changed mode: 0644->0755]
res/po/az.po [changed mode: 0644->0755]
res/po/bg.po [changed mode: 0644->0755]
res/po/ca.po [changed mode: 0644->0755]
res/po/cs.po [changed mode: 0644->0755]
res/po/da.po [changed mode: 0644->0755]
res/po/de_DE.po [changed mode: 0644->0755]
res/po/el_GR.po [changed mode: 0644->0755]
res/po/en.po [changed mode: 0644->0755]
res/po/en_PH.po [changed mode: 0644->0755]
res/po/en_US.po [changed mode: 0644->0755]
res/po/es_ES.po [changed mode: 0644->0755]
res/po/es_MX.po [changed mode: 0644->0755]
res/po/et.po [changed mode: 0644->0755]
res/po/eu.po [changed mode: 0644->0755]
res/po/fi.po [changed mode: 0644->0755]
res/po/fr_CA.po [changed mode: 0644->0755]
res/po/fr_FR.po [changed mode: 0644->0755]
res/po/ga.po [changed mode: 0644->0755]
res/po/gl.po [changed mode: 0644->0755]
res/po/hi.po [changed mode: 0644->0755]
res/po/hr.po [changed mode: 0644->0755]
res/po/hu.po [changed mode: 0644->0755]
res/po/hy.po [changed mode: 0644->0755]
res/po/is.po [changed mode: 0644->0755]
res/po/it_IT.po [changed mode: 0644->0755]
res/po/ja_JP.po [changed mode: 0644->0755]
res/po/ka.po [changed mode: 0644->0755]
res/po/kk.po [changed mode: 0644->0755]
res/po/ko_KR.po [changed mode: 0644->0755]
res/po/lt.po [changed mode: 0644->0755]
res/po/lv.po [changed mode: 0644->0755]
res/po/mk.po [changed mode: 0644->0755]
res/po/nb.po [changed mode: 0644->0755]
res/po/nl_NL.po [changed mode: 0644->0755]
res/po/pl.po [changed mode: 0644->0755]
res/po/pt_BR.po [changed mode: 0644->0755]
res/po/pt_PT.po [changed mode: 0644->0755]
res/po/ro.po [changed mode: 0644->0755]
res/po/ru_RU.po [changed mode: 0644->0755]
res/po/sk.po [changed mode: 0644->0755]
res/po/sl.po [changed mode: 0644->0755]
res/po/sr.po [changed mode: 0644->0755]
res/po/sv.po [changed mode: 0644->0755]
res/po/tr_TR.po [changed mode: 0644->0755]
res/po/uk.po [changed mode: 0644->0755]
res/po/uz.po [changed mode: 0644->0755]
res/po/zh_CN.po [changed mode: 0644->0755]
res/po/zh_HK.po [changed mode: 0644->0755]
res/po/zh_SG.po [changed mode: 0644->0755]
res/po/zh_TW.po [changed mode: 0644->0755]