projects
/
blender-staging.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
dbc9227
f025b7b
)
Merging r42482 through r42532 from trunk into soc-2011-tomato
author
Sergey Sharybin <sergey.vfx@gmail.com>
Fri, 9 Dec 2011 10:02:01 +0000
(10:02 +0000)
committer
Sergey Sharybin <sergey.vfx@gmail.com>
Fri, 9 Dec 2011 10:02:01 +0000
(10:02 +0000)
1
2
source/blender/blenkernel/intern/tracking.c
patch
|
diff1
|
diff2
|
blob
|
history
source/blender/editors/space_view3d/drawobject.c
patch
|
diff1
|
diff2
|
blob
|
history
source/blender/makesrna/intern/rna_tracking.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
source/blender/blenkernel/intern/tracking.c
Simple merge
diff --cc
source/blender/editors/space_view3d/drawobject.c
Simple merge
diff --cc
source/blender/makesrna/intern/rna_tracking.c
Simple merge
projects / blender-staging.git / commitdiff