3af74f4 update to git master branch

Authored and Committed by Dominik Mierzejewski 8 years ago
    update to git master branch
    
    - disable OpenCL for now (due to pocl FTBFS #1307869)
    - use BOOL with all boolean cmake options
    
        
file modified
+1 -0
file modified
+15 -12
file modified
+5 -5
file removed
-12
file removed
-41
file modified
+85 -27
file modified
+1 -2