Merge branch 'ubuntu-build'
Conflicts: README.md After setting up my new PC's build environment, I've made some changes to make both setups compatible.
This commit is contained in:
Conflicts: README.md After setting up my new PC's build environment, I've made some changes to make both setups compatible.