projects / platform / adaptation / emulator / device-manager-plugin-emul.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a661649 cc5e516)
Merge branch 'master' into tizen_2.1
authorjihye1128.kim <jihye1128.kim@samsung.com>
Thu, 18 Apr 2013 02:53:25 +0000 (11:53 +0900)
committerjihye1128.kim <jihye1128.kim@samsung.com>
Thu, 18 Apr 2013 02:53:25 +0000 (11:53 +0900)
Conflicts:
include/devman_define_node_path.h
include/devman_plugin_intf.h
packaging/device-manager-plugin-maru.spec
src/device_manager_io.c
src/device_manager_plugin_maru.c


Trivial merge
Domain: System / System Framework Device Management;