Nicolas Winkler 7eabac9ac5 Merge branch 'master' of http://192.168.1.47/nicolas/Almond %!s(int64=6) %!d(string=hai) anos
..
include 7eabac9ac5 Merge branch 'master' of http://192.168.1.47/nicolas/Almond %!s(int64=6) %!d(string=hai) anos
src 9de2c259db Merge branch 'master' of http://192.168.1.47/nicolas/Almond %!s(int64=6) %!d(string=hai) anos
CMakeLists.txt 91c9a9e56a corrected error with opencl cmake config %!s(int64=6) %!d(string=hai) anos