• johan's avatar
    Merge branch 'master' into ecc · 36fbc4b6
    johan authored
    # Conflicts:
    #	src/CMakeLists.txt
    #	tester/CMakeLists.txt
    #	tester/bctoolbox_tester.c
    #	tester/bctoolbox_tester.h
    36fbc4b6