diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2017-03-28 11:41:10 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2017-03-28 11:41:10 +0300 |
| commit | 885260117d6a9080ce073a1fb402b7af060f8645 (patch) | |
| tree | 1769a4c180115a0fdda86d5554159c43691f461b /extern | |
| parent | 6d21970aa06a31398ed4a78b1c596f30a0b9ee87 (diff) | |
| parent | e1909958d9ec48333a7bfd0d34aede66efc9b1ad (diff) | |
Merge branch 'master' into blender2.8
Conflicts:
source/blender/blenloader/intern/readfile.c
source/blender/windowmanager/intern/wm_window.c
Diffstat (limited to 'extern')
0 files changed, 0 insertions, 0 deletions