Commit History

Author SHA1 Message Date
  Steve Thielemann a0ded69931 We don't need the json directory. Remove from cmake. 3 years ago
  Steve Thielemann 2035637b49 Merge branch 'master' into json 3 years ago
  david 8ff81709a0 Missed commenting out dynamic links for logging 3 years ago
  Steve Thielemann 16aa8b21c4 Use conan.sh to switch between build systems. 3 years ago