Merge branch 'blender2.7'
authorBastien Montagne <montagne29@wanadoo.fr>
Thu, 23 May 2019 08:23:11 +0000 (10:23 +0200)
committerBastien Montagne <montagne29@wanadoo.fr>
Thu, 23 May 2019 08:23:11 +0000 (10:23 +0200)
commit58c4b10a708fbc24bca105dbf26dd991154c91ad
treec9779fb218d71487b8f313ee37be79ce0778351f
parent8389cc7e674bd54102a0244fa625ff4d49b678bf
parent054dbb833e15275e0e991e2c15e754a3e7583716
Merge branch 'blender2.7'

Conflicts:
source/blender/blenkernel/intern/library_remap.c
source/blender/blenkernel/intern/library_remap.c