diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-02-07 23:54:52 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-02-07 23:54:52 +0300 |
| commit | 749caf49845401656d13124b9692e51d0dc77bc5 (patch) | |
| tree | 203c5d9be6a0bfe52e992b9b96db886dd592a7bd /.gitignore | |
| parent | af425f3f7a08c09f7fbc7076b364fac75163b296 (diff) | |
| parent | 843271d0a5adec1059f91f7fd8854936a1228807 (diff) | |
Merge branch 'master' into blender2.8
Conflicts:
source/blender/windowmanager/intern/wm_files_link.c
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions