projects
/
blender-staging.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
872af48
de5d0d6
)
Merged changes in the trunk up to revision 52191.
author
Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Wed, 14 Nov 2012 02:01:02 +0000
(
02:01
+0000)
committer
Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Wed, 14 Nov 2012 02:01:02 +0000
(
02:01
+0000)
Conflicts resolved:
source/blender/makesdna/DNA_scene_types.h
12 files changed:
1
2
build_files/scons/tools/Blender.py
patch
|
diff1
|
diff2
|
blob
|
history
release/scripts/startup/bl_ui/space_view3d.py
patch
|
diff1
|
diff2
|
blob
|
history
source/blender/blenkernel/SConscript
patch
|
diff1
|
diff2
|
blob
|
history
source/blender/blenkernel/intern/object.c
patch
|
diff1
|
diff2
|
blob
|
history
source/blender/bmesh/bmesh_class.h
patch
|
diff1
|
diff2
|
blob
|
history
source/blender/bmesh/intern/bmesh_construct.c
patch
|
diff1
|
diff2
|
blob
|
history
source/blender/editors/interface/interface_templates.c
patch
|
diff1
|
diff2
|
blob
|
history
source/blender/editors/mesh/editmesh_select.c
patch
|
diff1
|
diff2
|
blob
|
history
source/blender/editors/mesh/mesh_intern.h
patch
|
diff1
|
diff2
|
blob
|
history
source/blender/editors/mesh/mesh_ops.c
patch
|
diff1
|
diff2
|
blob
|
history
source/blender/makesdna/DNA_scene_types.h
patch
|
diff1
|
diff2
|
blob
|
history
source/blender/render/intern/source/pipeline.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
build_files/scons/tools/Blender.py
Simple merge
diff --cc
release/scripts/startup/bl_ui/space_view3d.py
Simple merge
diff --cc
source/blender/blenkernel/SConscript
Simple merge
diff --cc
source/blender/blenkernel/intern/object.c
Simple merge
diff --cc
source/blender/bmesh/bmesh_class.h
Simple merge
diff --cc
source/blender/bmesh/intern/bmesh_construct.c
Simple merge
diff --cc
source/blender/editors/interface/interface_templates.c
Simple merge
diff --cc
source/blender/editors/mesh/editmesh_select.c
Simple merge
diff --cc
source/blender/editors/mesh/mesh_intern.h
Simple merge
diff --cc
source/blender/editors/mesh/mesh_ops.c
Simple merge
diff --cc
source/blender/makesdna/DNA_scene_types.h
Simple merge
diff --cc
source/blender/render/intern/source/pipeline.c
Simple merge