Jace 6684aa06b7 Merge branch 'master' into gui ...

Conflicts:
	src/GUI/Frame.h
	src/InputManager.cpp

2014-05-15 21:16:43 +02:00

..

defferedUtil.h

Started on deferred rendering framework.

2014-04-24 00:11:16 +02:00

GLError.h

Revert "Indentation style changed to Horstmann"

2014-04-12 01:48:15 +02:00

Logging.h

Revert "Indentation style changed to Horstmann"

2014-04-12 01:48:15 +02:00

Rectangle.h

Merge branch 'master' into gui

2014-05-15 21:16:43 +02:00

UnorderedMapPair.h

Resource manager OBJ vs Model conflict fixed

2014-04-27 08:07:18 +02:00