Julian Eisel e42e1769b3 Merge branch 'master' into blender2.8 ... Conflicts: source/blender/editors/gpencil/drawgpencil.c		2017-01-05 00:31:15 +01:00
..
bin	Call to python3 for stand-alone scripts	2016-07-26 05:18:00 +10:00
darwin	Blender 2.8 requires Mac OS 10.7 or later	2016-08-04 03:13:20 -04:00
datafiles	OpenCOlorIO: Add explicit linearSRGB -> sRGB lookup table	2016-09-15 15:56:47 +02:00
freedesktop	Update of our *nix .desktop file.	2015-08-27 16:31:13 +02:00
scripts	Merge branch 'master' into blender2.8	2017-01-05 00:31:15 +01:00
text	Add license text for OCIO configuration	2016-03-29 12:54:29 +02:00
windows	move windows out of source dir	2016-02-07 20:58:58 +11:00