Dalai Felinto 11130970c6 Merge commit 'origin/master^' into blender2.8

2018-03-29 10:36:01 -03:00

..

intern

Merge commit 'origin/master^' into blender2.8

2018-03-29 10:36:01 -03:00

test

Fix bad merge resolution from previous commit

2018-03-26 14:59:55 +02:00

CMakeLists.txt

Merge branch 'master' into blender2.8

2018-03-16 04:35:37 +01:00

GHOST_C-api.h

Merge branch 'master' into blender2.8

2018-03-21 16:27:48 +01:00

GHOST_IContext.h

GHOST: Add new interface to manage offscreen contexts.

2018-02-26 19:10:15 +01:00

GHOST_IEvent.h

…

GHOST_IEventConsumer.h

…

GHOST_ISystem.h

Merge branch 'master' into blender2.8

2018-03-21 16:27:48 +01:00

GHOST_ISystemPaths.h

…

GHOST_ITimerTask.h

…

GHOST_IWindow.h

…

GHOST_Path-api.h

…

GHOST_Rect.h

…

GHOST_Types.h

…