Merge branch 'master' into tizen_2.1
authorDoHyun Pyun <dh79.pyun@samsung.com>
Fri, 22 Mar 2013 00:15:54 +0000 (09:15 +0900)
committerDoHyun Pyun <dh79.pyun@samsung.com>
Fri, 22 Mar 2013 00:15:54 +0000 (09:15 +0900)
commitd5cdcfc848d3230ef800a05410d87baee11c6366
tree67e63bd266cdae314da7321155e430bbd5aae668
parent1843c4091ecf02dfec12e1927cd1e704ea1668af
Merge branch 'master' into tizen_2.1

Change-Id: Ibfab872a204cb21ed2f8e2c3059ff43254a1aa2f
90 files changed:
CMakeLists.txt
data/images/A01-4_device_Medical_press.png [new file with mode: 0644]
data/images/A01-4_device_camera_press.png [new file with mode: 0644]
data/images/A01-4_device_computer_press.png [new file with mode: 0644]
data/images/A01-4_device_display_press.png [new file with mode: 0644]
data/images/A01-4_device_gaming_press.png [new file with mode: 0644]
data/images/A01-4_device_headphone_press.png [new file with mode: 0644]
data/images/A01-4_device_headset_press.png [new file with mode: 0644]
data/images/A01-4_device_input_device_press.png [new file with mode: 0644]
data/images/A01-4_device_mouse_press.png [new file with mode: 0644]
data/images/A01-4_device_multimedia_press.png [new file with mode: 0644]
data/images/A01-4_device_network_infrastructure_press.png [new file with mode: 0644]
data/images/A01-4_device_printer_press.png [new file with mode: 0644]
data/images/A01-4_device_storage_press.png [new file with mode: 0644]
data/images/A01-4_device_telephone_press.png [new file with mode: 0644]
data/images/A01-4_device_unknown_press.png [new file with mode: 0644]
data/images/Q02_Notification_bluetooth.png [new file with mode: 0644]
data/images/Q02_icon_BT_receive.png [new file with mode: 0644]
data/images/Q02_icon_BT_transmit.png [new file with mode: 0644]
data/images/ug-bluetooth-efl.png [new file with mode: 0644]
data/ug-bluetooth-efl.xml
include/bt-dbus-method.h
include/bt-ipc-handler.h
include/bt-main-ug.h
include/bt-main-view.h
include/bt-profile-view.h
include/bt-resource.h
include/bt-string-define.h
include/bt-type-define.h
packaging/ug-bluetooth-efl.spec
po/CMakeLists.txt
po/ar.po
po/az.po
po/bg.po
po/ca.po
po/cs.po
po/da.po
po/de_DE.po
po/el_GR.po
po/en.po
po/en_PH.po
po/en_US.po
po/es_ES.po
po/es_MX.po [new file with mode: 0644]
po/et.po
po/eu.po
po/fi.po
po/fr_CA.po
po/fr_FR.po
po/ga.po
po/gl.po
po/hi.po
po/hr.po
po/hu.po
po/hy.po
po/is.po
po/it_IT.po
po/ja_JP.po
po/ka.po
po/kk.po
po/ko_KR.po
po/lt.po
po/lv.po
po/mk.po
po/nb.po
po/nl_NL.po
po/pl.po
po/pt_BR.po
po/pt_PT.po
po/ro.po
po/ru_RU.po
po/sk.po
po/sl.po
po/sr.po
po/sv.po
po/tr_TR.po
po/uk.po
po/uz.po
po/zh_CN.po
po/zh_HK.po
po/zh_SG.po
po/zh_TW.po
src/libraries/bt-callback.c
src/libraries/bt-dbus-method.c
src/libraries/bt-ipc-handler.c
src/libraries/bt-net-connection.c
src/ui/bt-main-ug.c
src/ui/bt-main-view.c
src/ui/bt-profile-view.c
ug-bluetooth-elf.manifest