merge with master
authorJinkun Jang <jinkun.jang@samsung.com>
Fri, 15 Mar 2013 16:18:03 +0000 (01:18 +0900)
committerJinkun Jang <jinkun.jang@samsung.com>
Fri, 15 Mar 2013 16:18:03 +0000 (01:18 +0900)
commit672bf127a4207f6c3becf5fd73b5d4c1c3c576b2
tree729c0169d3744dd931317fbad4bb1505a80c2431
parentff726535277f55da582f94b94ae9bcb0d0717d86
merge with master
packaging/haptic-module-tizen.spec
test/test.c [new file with mode: 0644]
tizen/DEVICE/CMakeLists.txt
tizen/DEVICE/include/file.h [moved from include/haptic_file.h with 95% similarity]
tizen/DEVICE/src/file.c [moved from tizen/DEVICE/src/haptic_module_file.c with 80% similarity]
tizen/DEVICE/src/haptic_module_internal.c
tizen/DEVICE/src/sysnoti.c [new file with mode: 0644]
tizen/SIMULATOR/CMakeLists.txt
tizen/SIMULATOR/src/haptic_module_internal.c