projects
/
blender-staging.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
9d32423
0df30d1
)
svn merge ^/trunk/blender -r47023:HEAD
author
Ove Murberg Henriksen <sorayasilvermoon@hotmail.com>
Sun, 17 Jun 2012 04:14:44 +0000
(
04:14
+0000)
committer
Ove Murberg Henriksen <sorayasilvermoon@hotmail.com>
Sun, 17 Jun 2012 04:14:44 +0000
(
04:14
+0000)
1
2
source/blender/editors/object/object_ops.c
patch
|
diff1
|
diff2
|
blob
|
history
source/blender/editors/object/object_vgroup.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
source/blender/editors/object/object_ops.c
Simple merge
diff --cc
source/blender/editors/object/object_vgroup.c
Simple merge