Signed-off-by: Jurgen Schober <jurgen.schober@pointdesign.com>
Sync

Signed-off-by: Jurgen Schober <jurgen.schober@pointdesign.com>
Resolved conflict

Signed-off-by: Jurgen Schober <jurgen.schober@pointdesign.com>
Merge branch 'master' of
https://github.com/juergen0815/sdl-multi-texture.git

Conflicts:
	src/flag.h
	src/renderer.cpp

Signed-off-by: Jurgen Schober <jurgen.schober@pointdesign.com>