merge commits of 2.2.1 to public
-rw-r--r-- 2807 CMakeLists.txt
-rw-r--r-- 11358 LICENSE.APLv2.0
-rw-r--r-- 211 NOTICE
drwxr-xr-x - inc
-rw-r--r-- 269 osp-image.pc.in
drwxr-xr-x - packaging
drwxr-xr-x - src