diff options
| author | Germano <germano.costa@ig.com.br> | 2017-10-29 23:20:24 +0300 |
|---|---|---|
| committer | Germano <germano.costa@ig.com.br> | 2017-10-29 23:20:24 +0300 |
| commit | bed3cbdf3d88a61cf081941c0fd96205f47ecee7 (patch) | |
| tree | a525a64586ab602101e08134bcd5ba3dcb98a7c1 /source/blender/compositor/COM_defines.h | |
| parent | 34859b285aff14b022c9b175fa2babfff7c63314 (diff) | |
| parent | 475ec5269ae8f7c30795c2e771100e087b5dd315 (diff) | |
Merge branch 'master' into blender2.8
# Conflicts:
# build_files/cmake/macros.cmake
# build_files/cmake/platform/platform_win32.cmake
Diffstat (limited to 'source/blender/compositor/COM_defines.h')
0 files changed, 0 insertions, 0 deletions