tleety 9a381e84af Merge remote-tracking branch 'origin/master' into GLrenderer ...

# Conflicts:
#	include/Core/Engine.h

2015-09-10 22:16:15 +02:00

..

Models/Core

Added unit quad to core assets

2015-09-10 22:09:42 +02:00

Textures

Added some textures for rendering testing

2015-09-10 21:08:56 +02:00