svn merge ^/trunk/blender -r46370:46380
authorOve Murberg Henriksen <sorayasilvermoon@hotmail.com>
Tue, 8 May 2012 00:09:00 +0000 (00:09 +0000)
committerOve Murberg Henriksen <sorayasilvermoon@hotmail.com>
Tue, 8 May 2012 00:09:00 +0000 (00:09 +0000)
commite8c945bfb9ec03f486a1df4dd9b0ea5c833c3ee8
tree8715bb6d353b715a7fc8c9c21f062ee81cc82825
parent03f0b472db7315167045db8b737440bd65b01845
parentf618bada2b27ab9b41ebbdc3be8baff4e798a6c0
svn merge ^/trunk/blender -r46370:46380
1 Tree conflict
I deleted the source/tools/GL and then ran:
svn -r46380 co https://svn.blender.org/svnroot/bf-blender/trunk/blender/source/tools/GL
svn resolve --accept working -R source/tools/GL
18 files changed:
source/blender/blenkernel/intern/DerivedMesh.c
source/blender/blenkernel/intern/depsgraph.c
source/blender/blenkernel/intern/displist.c
source/blender/blenkernel/intern/movieclip.c
source/blender/blenkernel/intern/tracking.c
source/blender/collada/MeshImporter.cpp
source/blender/editors/mesh/editmesh_select.c
source/blender/editors/object/object_add.c
source/blender/editors/space_clip/clip_buttons.c
source/blender/editors/space_clip/clip_draw.c
source/blender/editors/space_clip/clip_editor.c
source/blender/editors/space_clip/clip_graph_draw.c
source/blender/editors/space_clip/clip_graph_ops.c
source/blender/editors/space_clip/clip_ops.c
source/blender/editors/space_clip/clip_utils.c
source/blender/editors/space_clip/space_clip.c
source/blender/editors/space_clip/tracking_ops.c
source/blender/editors/space_view3d/drawobject.c