merge with master
authorJinkun Jang <jinkun.jang@samsung.com>
Fri, 15 Mar 2013 16:04:46 +0000 (01:04 +0900)
committerJinkun Jang <jinkun.jang@samsung.com>
Fri, 15 Mar 2013 16:04:46 +0000 (01:04 +0900)
commit6a9e36faaabdcf45e2d76c01e5423819d6734f29
tree7aa43299d66f38410b53a36b1a475ffd87743495
parent7c83e9661e76a4297913256f65d84709c9c3e26e
merge with master
21 files changed:
daemon/idletxt/idletxt.c
daemon/minictrl/minictrl.c
daemon/notifications/brightness.c
daemon/notifications/noti.c
daemon/notifications/noti.h
daemon/notifications/noti_box.c
daemon/notifications/noti_display_app.c [deleted file]
daemon/notifications/noti_display_app.h [deleted file]
daemon/notifications/noti_win.c
daemon/notifications/ticker.c
daemon/quickpanel-ui.c
daemon/quickpanel-ui.h
data/quickpanel.xml.in
data/quickpanel_def.h
data/quickpanel_notibox.edc
data/quickpanel_spn.edc
data/quickpanel_theme.edc
data/quickpanel_theme_element.edc
org.tizen.quickpanel.manifest
packaging/org.tizen.quickpanel.spec
packaging/quickpanel.service