projects
/
blender.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
0b1c673
a5d0597
)
Merge branch 'master' into blender2.8
author
Bastien Montagne <montagne29@wanadoo.fr>
Thu, 3 May 2018 14:01:43 +0000
(16:01 +0200)
committer
Bastien Montagne <montagne29@wanadoo.fr>
Thu, 3 May 2018 14:01:43 +0000
(16:01 +0200)
1
2
source/blender/makesrna/intern/rna_constraint.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
source/blender/makesrna/intern/rna_constraint.c
Simple merge