merge with master
authorJinkun Jang <jinkun.jang@samsung.com>
Fri, 15 Mar 2013 16:16:46 +0000 (01:16 +0900)
committerJinkun Jang <jinkun.jang@samsung.com>
Fri, 15 Mar 2013 16:16:46 +0000 (01:16 +0900)
commitb8f15a6a25de20ad1dde0a90db994bf08ae6a43e
treee8866d4d51a79a9b2cdbc5e23d968cdce24d528e
parentad52b5fc5ba54712b904d966f35d2971d68b111c
merge with master
19 files changed:
CMakeLists.txt [changed mode: 0755->0644]
inc/FUixVisionFaceDetector.h [changed mode: 0755->0644]
inc/FUixVisionFaceRecognitionInfo.h [changed mode: 0755->0644]
inc/FUixVisionFaceRecognizer.h [changed mode: 0755->0644]
packaging/osp-face.spec [changed mode: 0755->0644]
src/FUixVisionFaceBuffer.cpp [changed mode: 0755->0644]
src/FUixVisionFaceComponentsPosition.cpp [changed mode: 0755->0644]
src/FUixVisionFaceDetector.cpp [changed mode: 0755->0644]
src/FUixVisionFaceRecognitionInfo.cpp [changed mode: 0755->0644]
src/FUixVisionFaceRecognizer.cpp [changed mode: 0755->0644]
src/FUixVision_FaceDetectorImpl.cpp [changed mode: 0755->0644]
src/FUixVision_FaceDetectorImpl.h [changed mode: 0755->0644]
src/FUixVision_FaceRecognizerImpl.cpp [changed mode: 0755->0644]
src/FUixVision_FaceRecognizerImpl.h [changed mode: 0755->0644]
src/FUixVision_FaceUtil.cpp [new file with mode: 0644]
src/FUixVision_FaceUtil.h [new file with mode: 0644]
src/caBasicDef.h [new file with mode: 0644]
src/caBasicDef_ENUM.h [new file with mode: 0644]
src/caFaceAPP_interface.h [new file with mode: 0644]