Dmitry Marakasov f7ec8612a7 Merge branch 'master' into doxygen
Conflicts:
	SDL2pp/AudioDevice.hh
	SDL2pp/Renderer.hh
	SDL2pp/SDL2pp.hh
	SDL2pp/Texture.hh
2014-12-26 16:33:01 +03:00
..
2014-12-25 19:15:28 +03:00
2014-12-18 02:52:08 +03:00
2014-12-19 21:30:10 +03:00
2014-12-25 22:25:44 +03:00
2014-12-25 19:10:41 +03:00
2014-12-25 22:34:16 +03:00
2014-12-25 19:10:41 +03:00
2014-12-25 22:34:16 +03:00
2014-12-25 19:32:55 +03:00
2014-12-26 16:33:01 +03:00
2014-12-18 17:24:19 +03:00
2014-12-20 00:40:31 +03:00
2014-12-26 16:33:01 +03:00
2014-12-18 02:52:08 +03:00
2014-12-19 21:30:10 +03:00
2014-12-25 19:10:41 +03:00
2014-12-26 16:33:01 +03:00
2014-12-26 16:19:05 +03:00
2014-12-18 02:52:08 +03:00
2014-12-18 02:52:08 +03:00