projects
/
blender-staging.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
de4e940
4580128
)
Merging r49451 through r49462 from trunk into soc-2011-tomato
author
Sergey Sharybin <sergey.vfx@gmail.com>
Wed, 1 Aug 2012 15:05:42 +0000
(15:05 +0000)
committer
Sergey Sharybin <sergey.vfx@gmail.com>
Wed, 1 Aug 2012 15:05:42 +0000
(15:05 +0000)
1
2
intern/cycles/device/device_opencl.cpp
patch
|
diff1
|
diff2
|
blob
|
history
source/blender/compositor/operations/COM_ViewerBaseOperation.cpp
patch
|
diff1
|
diff2
|
blob
|
history
source/blender/editors/space_image/image_ops.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
intern/cycles/device/device_opencl.cpp
Simple merge
diff --cc
source/blender/compositor/operations/COM_ViewerBaseOperation.cpp
Simple merge
diff --cc
source/blender/editors/space_image/image_ops.c
Simple merge
projects / blender-staging.git / commitdiff