Merge remote-tracking branch 'origin/master' into blender2.8
authorDalai Felinto <dfelinto@gmail.com>
Wed, 25 Apr 2018 07:31:25 +0000 (09:31 +0200)
committerDalai Felinto <dfelinto@gmail.com>
Wed, 25 Apr 2018 07:31:25 +0000 (09:31 +0200)
commitdfd82b18df6b73cd91272f0b66d9fa59815db44c
tree654ccb30fd83ee9ed9a8cac46df742180445e2e6
parent2fe35914e17d6173925be06c61974479666b9ef7
parent5285de16f3e8f6b29a85eda5d7632a98cd0cddfe
Merge remote-tracking branch 'origin/master' into blender2.8
GNUmakefile
build_files/cmake/macros.cmake
build_files/cmake/platform/platform_unix.cmake