nicolas/Almond @ 1efaaa6a4e86546b40727223390cecc4bcfaf54d

Nicolas Winkler 7eabac9ac5 Merge branch 'master' of http://192.168.1.47/nicolas/Almond		6 gadi atpakaļ
..
include	7eabac9ac5 Merge branch 'master' of http://192.168.1.47/nicolas/Almond	6 gadi atpakaļ
src	9de2c259db Merge branch 'master' of http://192.168.1.47/nicolas/Almond	6 gadi atpakaļ
CMakeLists.txt	91c9a9e56a corrected error with opencl cmake config	6 gadi atpakaļ