• Sylvain Thery's avatar
    Merge branch 'qt5' into develop · e8571f58
    Sylvain Thery authored
    Conflicts:
    	SCHNApps/Plugins/surface_modelisation/src/surface_modelisation.cpp
    	SCHNApps/include/types.h
    	SCHNApps/include/view.h
    	SCHNApps/src/schnapps.cpp
    	SCHNApps/src/view.cpp
    	ThirdParty/OpenNL/CMakeLists.txt
    e8571f58
types.h 1.59 KB