merge with master
authorJinkun Jang <jinkun.jang@samsung.com>
Fri, 15 Mar 2013 16:05:14 +0000 (01:05 +0900)
committerJinkun Jang <jinkun.jang@samsung.com>
Fri, 15 Mar 2013 16:05:14 +0000 (01:05 +0900)
commit2aba9fb3ea843bc0dd4d10999157267221f26ed5
tree6a4eaf3a6de53d58ab84bb7fb6149c3b025a7efc
parent1304f307eac6c259796ce4971a1c84a3c27b3196
merge with master
29 files changed:
CMakeLists.txt
LICENSE.Apache_v2 [moved from LICENSE.APLv2 with 100% similarity]
NOTICE
data/usb_icon.png [new file with mode: 0755]
direct_set_debug.sh [new file with mode: 0755]
include/um_common.h
include/um_customize.h
include/um_data.h
include/um_usb_accessory_manager.h
include/um_usb_connection_manager.h
include/um_usb_host_manager.h
include/um_usb_notification.h [new file with mode: 0644]
include/um_usb_server.h
include/um_usb_uevent_handler.h [new file with mode: 0644]
packaging/usb-manager.spec
packaging/usb-server.manifest
po/CMakeLists.txt
po/es_MX.po [moved from po/es_US.po with 100% similarity]
set_usb_debug.sh
src/um_common.c
src/um_customize.c
src/um_main.c
src/um_usb_accessory_manager.c
src/um_usb_connection_manager.c
src/um_usb_host_manager.c
src/um_usb_notification.c [new file with mode: 0644]
src/um_usb_server.c
src/um_usb_uevent_handler.c [new file with mode: 0644]
udev-rules/91-usb-server.rules.in [deleted file]