James Gray 6a3ef9b950 Merge remote-tracking branch 'upstream/master' ...

Conflicts:
	project/src/text/Font.cpp

2015-07-08 09:58:31 -05:00

..

include

Merge remote-tracking branch 'upstream/master'

2015-07-03 02:08:02 -05:00

lib

Do not include LZMA bindings

2015-06-24 13:25:17 -07:00

src

Merge remote-tracking branch 'upstream/master'

2015-07-08 09:58:31 -05:00

Build.xml

Remove ByteArray CFFI

2015-07-06 13:25:39 -07:00