projects
/
blender-staging.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
c8f5dac
04a0796
)
Merging r43871 through r43908 from trunk into soc-2011-tomato
author
Sergey Sharybin <sergey.vfx@gmail.com>
Sun, 5 Feb 2012 14:39:43 +0000
(14:39 +0000)
committer
Sergey Sharybin <sergey.vfx@gmail.com>
Sun, 5 Feb 2012 14:39:43 +0000
(14:39 +0000)
1
2
release/scripts/startup/bl_ui/space_clip.py
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
release/scripts/startup/bl_ui/space_clip.py
Simple merge