Julian Eisel 2a82162618 Merge branch 'master' into blender2.8 ...

Conflicts:
	source/blender/editors/armature/pose_select.c
	source/blender/editors/include/ED_armature.h

2017-03-03 12:55:35 +01:00

..

blender

Merge branch 'master' into blender2.8

2017-03-03 12:55:35 +01:00

blenderplayer

Fix blenderplayer building (tm)

2017-03-03 10:09:42 +01:00

creator

Merge branch 'master' into blender2.8

2017-02-26 00:15:59 +01:00

gameengine

Merge branch 'master' into blender2.8

2017-03-02 00:22:13 +11:00

tools @ b11375e890

Fix blurry icons

2017-01-29 17:21:57 +03:00

CMakeLists.txt

Move tests into tests/ top-level dir

2014-06-18 22:03:46 +10:00