Merge branch 'master' of https://git.lemmasoftware.org/Merlin
-rw-r--r-- 1715 CMakeLists.txt
-rw-r--r-- 16726 LICENCE
-rw-r--r-- 403 Merlin.dox
-rw-r--r-- 69 README.md
drwxr-xr-x - config
drwxr-xr-x - examples
drwxr-xr-x - include
drwxr-xr-x - src
drwxr-xr-x - testing