diff options
author | Antonio Vazquez <blendergit@gmail.com> | 2021-07-08 15:37:51 +0300 |
---|---|---|
committer | Antonio Vazquez <blendergit@gmail.com> | 2021-07-08 15:37:51 +0300 |
commit | 135c483e50a2323d50ceb3ee381e57f13e0ae58d (patch) | |
tree | af04ea80671c6ef12406bc8dd397c26e7a510d0a /build_files/windows | |
parent | c7ec464036bad6d8f40dbcd10c422290efd275b6 (diff) | |
parent | 80d0b682905a8fb3aca6297d1205f46391b9b125 (diff) |
Merge master into temp-gpencil-bezier-stroke-type
Conflicts:
MOD_gpenciloffset.c
Diffstat (limited to 'build_files/windows')
0 files changed, 0 insertions, 0 deletions