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:
2015-05-17 12:33:31 +10:00
42 changed files with 58 additions and 117 deletions
+1
View File
@@ -1,4 +1,5 @@
TODO: upgrade to lua 5.3
TODO: upgrade to SDL 2.0
TODO: Split config.cfg in two, one for the server and the client
TODO: Consistency for bounds names