Merge branch 'database'

Conflicts:
	todo.txt

Merging todo.txt into the master branch, despite trying to keep it
separate.
This commit is contained in:
Kayne Ruse
2014-05-07 21:08:37 +10:00
2 changed files with 38 additions and 1 deletions
+1 -1
View File
@@ -6,7 +6,7 @@ This game is inspired by classic 2D RPGs, as well as more modern sandbox MMOs. T
## External Dependencies
* [SDL 1.6](http://www.libsdl.org/) - Simple DirectMedia Layer API
* [SDL 1.2](http://www.libsdl.org/) - Simple DirectMedia Layer API
* [SDL_net 1.2](http://www.libsdl.org/projects/SDL_net/) - SDL's networking extension
* [lua 5.2](http://www.lua.org/) - The lua programming language
* [SQLite3](http://www.sqlite.org/) - A lightweight SQL database engine