diff options
| author | Nicholas Rishel <rishel.nick@gmail.com> | 2021-02-16 10:27:21 +0300 |
|---|---|---|
| committer | Nicholas Rishel <rishel.nick@gmail.com> | 2021-02-16 10:27:21 +0300 |
| commit | dd79a715c98147dd1603b867502d3d8a0c8ca777 (patch) | |
| tree | 8025b6f3fbc6449f100a32a7fc1a932c50ccfc10 /intern/ghost/GHOST_C-api.h | |
| parent | 63fb53ad95dc21cc6f8647e4a157ddefa938e28f (diff) | |
| parent | 2e81f2c01abd21fdbc79625f3f7a0778103fa199 (diff) | |
Merge branch 'blender-v2.92-release'
# Conflicts:
# intern/ghost/intern/GHOST_SystemWin32.cpp
# intern/ghost/intern/GHOST_WindowWin32.cpp
# intern/ghost/intern/GHOST_WindowWin32.h
Diffstat (limited to 'intern/ghost/GHOST_C-api.h')
0 files changed, 0 insertions, 0 deletions