Dalai Felinto dd23e52817 Merge remote-tracking branch 'origin/master' into blender2.8 ...

Conflicts:
	source/blender/blenloader/intern/versioning_defaults.c

2016-10-21 12:22:50 +00:00

..

bl_operators

Merge branch 'master' into blender2.8

2016-10-07 00:22:21 +02:00

bl_ui

Merge remote-tracking branch 'origin/master' into blender2.8

2016-10-21 12:22:50 +00:00

keyingsets_builtins.py

Fixes for pose library change 601ce6a89c

2016-09-28 15:40:22 +02:00

nodeitems_builtins.py

Cleanup: unused vars, imports, pep8

2016-08-01 11:55:06 +10:00