Merge branch 'master' into blender2.8
authorSergey Sharybin <sergey.vfx@gmail.com>
Mon, 16 Apr 2018 08:19:03 +0000 (10:19 +0200)
committerSergey Sharybin <sergey.vfx@gmail.com>
Mon, 16 Apr 2018 08:19:03 +0000 (10:19 +0200)
commit8ad93dd0098d8b8356bfce27f716488f9afd653e
treeffe463a34c395cdac0d83df3a94e6593134a1b84
parent6ef5b422fce9deb1278b7092890ebe5e10227eae
parent6617818c7a1f5729763aa214866b5d7dc0358f36
Merge branch 'master' into blender2.8
source/blender/blenkernel/intern/icons.c
source/blender/blenlib/CMakeLists.txt
tests/gtests/blenlib/CMakeLists.txt