merge with master
authorJinkun Jang <jinkun.jang@samsung.com>
Fri, 15 Mar 2013 16:11:59 +0000 (01:11 +0900)
committerJinkun Jang <jinkun.jang@samsung.com>
Fri, 15 Mar 2013 16:11:59 +0000 (01:11 +0900)
commit196dd017f5b41eed8dc42f0735b89808876eba5d
tree48c1b96e4d14e185b535c10854f0bb44048fe3db
parentd299a44b1d1601b46b95857ea7443b573aae42a4
merge with master
CMakeLists.txt
include/nfc.h
packaging/capi-network-nfc.spec
src/nfc.c