Merge commits Tizen 2.2 to Tizen 2.2.1 45/13545/1 accepted/tizen/mobile tizen accepted/tizen/mobile/20131216.220431 submit/tizen/20131210.003739 submit/tizen/20140108.001250
authorhowon kim <howon.kim@samsung.com>
Mon, 9 Dec 2013 09:28:53 +0000 (18:28 +0900)
committerhowon kim <howon.kim@samsung.com>
Mon, 9 Dec 2013 09:28:53 +0000 (18:28 +0900)
commit16f5fc85852d20e9fb1b7f01ce81e86eb0d0191f
tree97d70e1458770cb8a6865b1738c28014ce1d258d
parent1cd2d83374769eab81273d15b1ebb11c0e89fb74
Merge commits Tizen 2.2 to Tizen 2.2.1

Change-Id: Ie6b70e64d23b1f3285900f740e17850877bbb053
Signed-off-by: howon kim <howon.kim@samsung.com>
13 files changed:
inc/FUixVisionImageFeatureInfo.h
inc/FUixVisionImageFeatureManager.h
inc/FUixVisionImageObject.h
inc/FUixVisionImageRecognizer.h
inc/FUixVisionQrCodeGenerator.h
inc/FUixVisionQrCodeObject.h
inc/FUixVisionQrCodeRecognizer.h
inc/FUixVisionQrCodeTypes.h
packaging/osp-vision.spec
src/FUixVisionQrCodeGenerator.cpp
src/FUixVision_ImageFeatureManagerImpl.cpp
src/FUixVision_ImageFeatureManagerImpl.h
src/FUixVision_QrCodeGeneratorImpl.cpp