merge with master
authorJinkun Jang <jinkun.jang@samsung.com>
Fri, 15 Mar 2013 16:03:45 +0000 (01:03 +0900)
committerJinkun Jang <jinkun.jang@samsung.com>
Fri, 15 Mar 2013 16:03:45 +0000 (01:03 +0900)
commitb4ebab4ee5a7a7f92de861829b454f276a462c93
tree19f44e51a1487bd47821bf8cc36ac93801380a36
parentca272ea3c9d0190570898195d27a9db013d44c61
merge with master
18 files changed:
CMakeLists.txt
common/cal-svc.c
data/edc/layout/inc.layouts.edc
data/edc/theme2/genlist.edc
data/edc/theme3/originals/genlist_macro.edc
data/edc/theme3/originals/genlist_textblock_style.edc
data/edc/theme3/originals/tizen-hd-inc.edc
include/cal-svc.h
include/cld.h
packaging/org.tizen.calendar.spec
src/list-base.c
src/list-delete.c
src/main.c
src/view-main-week.c
ug/detail/detail-ug.c
ug/edit/edit-ug.c
ug/list/ug-list.c
viewer/viewer.c