Merge branch 'master' of https://git.lemmasoftware.org/Merlin into master master
authorTrevor Irons <Trevor.Irons@lemmasoftware.org>
Sat, 12 Sep 2020 15:33:34 +0000 (09:33 -0600)
committerTrevor Irons <Trevor.Irons@lemmasoftware.org>
Sat, 12 Sep 2020 15:33:34 +0000 (09:33 -0600)
commit43d5c7328b23acb7a682a2a62c5928d9ac87f5d6
treeabcd02b646f1b759f9939361b30e4eb0c2d17853
parent11585c0398c37370c85be8b4ccba997d576a9102
parent386bfa84170068a936b348f75af962182fb9a029
Merge branch 'master' of https://git.lemmasoftware.org/Merlin into master
CMakeLists.txt