diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2017-11-15 12:46:19 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2017-11-15 12:46:19 +0300 |
| commit | 2a7f8d3cb332055f026cd09933136d6981b585e7 (patch) | |
| tree | ae93233578e32570c1f5d47f83dd0b81a9bfefb9 /release | |
| parent | 44517c5f2177d1f260ba691fb59fbacfef576915 (diff) | |
| parent | 556b13f03e561b54d4f0186e207f080c786f8b66 (diff) | |
Merge branch 'master' into blender2.8
Conflicts:
source/blender/blenlib/BLI_math_matrix.h
source/blender/blenlib/intern/math_matrix.c
source/blender/blenlib/intern/rand.c
source/blender/editors/animation/anim_channels_edit.c
source/blender/makesrna/intern/rna_mask.c
Diffstat (limited to 'release')
| m--------- | release/datafiles/locale | 0 | ||||
| m--------- | release/scripts/addons | 0 | ||||
| m--------- | release/scripts/addons_contrib | 0 |
3 files changed, 0 insertions, 0 deletions
diff --git a/release/datafiles/locale b/release/datafiles/locale -Subproject c93ed11a47b3016cf59711ec16de2e2e94c30e9 +Subproject b3d9c97f487bff8b2423c903c14204ba5ca21a8 diff --git a/release/scripts/addons b/release/scripts/addons -Subproject 371960484a38fc64e0a2635170a41a0d8ab2f6b +Subproject 5b02e6e1acc4c3cf4822607ab33f48d7cffecbd diff --git a/release/scripts/addons_contrib b/release/scripts/addons_contrib -Subproject a8515cfdfe9a98127b592f36fcbe51b7e23b969 +Subproject c3991195ad6eac741db27dc9e8905efb224f219 |