9e60bc5 Upstream integration

Authored and Committed by denisarnaud 12 years ago
    Upstream integration
    New CMake build system
    
        
file modified
+2 -1
file modified
+166 -100
file modified
+1 -1