projects
/
blender-staging.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
1920c4e
ad647b2
)
Merging r50037 through r50039 from trunk into soc-2011-tomato
author
Sergey Sharybin <sergey.vfx@gmail.com>
Mon, 20 Aug 2012 10:57:51 +0000
(10:57 +0000)
committer
Sergey Sharybin <sergey.vfx@gmail.com>
Mon, 20 Aug 2012 10:57:51 +0000
(10:57 +0000)
1
2
source/blender/blenkernel/intern/sequencer.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
source/blender/blenkernel/intern/sequencer.c
Simple merge