diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2017-08-07 22:09:10 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2017-08-07 22:09:10 +0300 |
| commit | cf8add42b807449e6f96f8ecab637d52e166052f (patch) | |
| tree | c6fe3713ea8a1b85eb986dcfb08546772166202e /extern | |
| parent | e673c9dc938844d158abe543457aca8016ef8bc1 (diff) | |
| parent | a4bbce894914837c65f06f466f40e0cc1db7acb9 (diff) | |
Merge branch 'master' into blender2.8
Stupid git handles merges terribly when there are conflicts and branch
is modified buring merge process... :((((
Diffstat (limited to 'extern')
0 files changed, 0 insertions, 0 deletions