Merge branch 'blender2.7'
authorSergey Sharybin <sergey.vfx@gmail.com>
Thu, 27 Dec 2018 18:13:27 +0000 (19:13 +0100)
committerSergey Sharybin <sergey.vfx@gmail.com>
Thu, 27 Dec 2018 18:13:27 +0000 (19:13 +0100)
commit3e5374bf1ecda6515808e348a768ed7afa536505
tree47ceb06abd968da4405e47c46b03a35a7f40087b
parent5b9440278ee9001645e4475436f6899c84d4ba1c
parent826d7adde79216d271b78059c05abd10b7559899
Merge branch 'blender2.7'
source/blender/blenkernel/intern/font.c