diff options
| author | Julian Eisel <eiseljulian@gmail.com> | 2016-09-23 02:40:19 +0300 |
|---|---|---|
| committer | Julian Eisel <eiseljulian@gmail.com> | 2016-09-23 02:40:19 +0300 |
| commit | 1dfb89d229304c302b8849756aa0ddd7e8d96488 (patch) | |
| tree | db7a2ed403101788b2cb308538d73a99c95621d6 /.gitmodules | |
| parent | 4a1feaa5558ed60388fd3be41db74fbc54f2ab08 (diff) | |
| parent | 1b2b7cfa2007172e07d78324bb941d0160b59c42 (diff) | |
Merge branch 'master' into blender2.8
Conflicts:
intern/ghost/intern/GHOST_ContextCGL.mm
intern/ghost/intern/GHOST_WindowCocoa.mm
source/blender/makesrna/intern/rna_main.c
Diffstat (limited to '.gitmodules')
0 files changed, 0 insertions, 0 deletions