Dmitry Marakasov ffdeb9465d Merge branch 'master' into ttf ...

Conflicts:
	CMakeLists.txt
	SDL2pp/SDL2pp.hh

2014-12-28 06:14:12 +03:00

..

audio_sine.cc

Switch AudioDevice to Optional

2014-12-25 19:15:28 +03:00

audio_wav.cc

Switch AudioDevice to Optional

2014-12-25 19:15:28 +03:00

CMakeLists.txt

Bundle Bitstream Vera font

2014-12-28 04:01:58 +03:00

image.cc

Merge branch 'surface'

2014-12-28 04:29:07 +03:00

lines.cc

Remove demos into more suitable examples

2014-12-20 18:04:22 +03:00

rendertarget.cc

Axe out remaining uses of old Point/Rect API

2014-12-25 19:30:37 +03:00

sprites.cc

Axe out remaining uses of old Point/Rect API

2014-12-25 19:30:37 +03:00

ttf.cc

Bundle Bitstream Vera font

2014-12-28 04:01:58 +03:00