Commit History

Autor SHA1 Mensaxe Data
  Steve Thielemann a0ded69931 We don't need the json directory. Remove from cmake. %!s(int64=3) %!d(string=hai) anos
  Steve Thielemann 2035637b49 Merge branch 'master' into json %!s(int64=3) %!d(string=hai) anos
  Steve Thielemann 16aa8b21c4 Use conan.sh to switch between build systems. %!s(int64=3) %!d(string=hai) anos