Vizzy!
Vizzy!

V.E.R.B.L.E.N.D.E.T.: Versatile Electronic Replicant Built for Logical Exploration, Nocturnal Destruction and Efficient Troubleshooting
 
 
2006-06-04
23:19:31

[voa@blendi source]$ grep conflict log.txt
rcsmerge: warning: conflicts during merge
cvs server: conflicts found in blender/intern/elbeem/intern/solver_main.cpp
rcsmerge: warning: conflicts during merge
cvs server: conflicts found in blender/source/blender/blenkernel/intern/material.c
rcsmerge: warning: conflicts during merge
cvs server: conflicts found in blender/source/blender/makesdna/DNA_material_types.h
rcsmerge: warning: conflicts during merge
cvs server: conflicts found in blender/source/blender/render/intern/source/pipeline.c
rcsmerge: warning: conflicts during merge
cvs server: conflicts found in blender/source/blender/src/buttons_shading.c
rcsmerge: warning: conflicts during merge
cvs server: conflicts found in blender/source/blender/src/drawview.c
rcsmerge: warning: conflicts during merge
cvs server: conflicts found in blender/source/blender/src/editmesh_add.c
rcsmerge: warning: conflicts during merge
cvs server: conflicts found in blender/source/blender/src/headerbuttons.c
rcsmerge: warning: conflicts during merge
cvs server: conflicts found in blender/source/blender/src/writeimage.c


__________________

[voa@blendi source]$ ./blender-cvs.sh
i686-pc-linux-gnu
########################################################
login to cvs, press ENTER for password
########################################################
Logging in to :pserver:anonymous@cvs.blender.org:2401/cvsroot/bf-blender
CVS password:
########################################################
checkout lib
########################################################
? lib/linux-glibc2.3.6-i386
########################################################
checkout current cvs
########################################################
? blender/README-cloth-modifier.txt
? blender/cloth-modifier-existing-20060405.patch
? blender/console_patch.txt.diff
? blender/delete_keyframe.patch
? blender/lock_axis_ipo.patch
? blender/rotate_about_active_twcent.patch
? blender/obj/linux-glibc2.3.6-i386
? blender/source/blender/blenkernel/BKE_cloth.h
? blender/source/blender/blenkernel/BKE_stdout.h
? blender/source/blender/blenkernel/intern/cloth.c
? blender/source/blender/blenkernel/intern/kdop.c
? blender/source/blender/blenkernel/intern/provot.c
? blender/source/blender/blenlib/BLI_process.h
? blender/source/blender/blenlib/intern/BLI_process.c
? blender/source/blender/include/BIF_drawstdout.h
? blender/source/blender/include/gl2ps.c
? blender/source/blender/include/gl2ps.h
? blender/source/blender/include/zblur.c
? blender/source/blender/include/zblur.h
? blender/source/blender/makesdna/DNA_cloth_types.h
? blender/source/blender/render/intern/source/ray.c.x
? blender/source/blender/render/intern/source/zblur.c
? blender/source/blender/src/buttons_layer.c
? blender/source/blender/src/drawstdout.c
? blender/source/blender/src/gl2ps.c
? blender/source/blender/src/gl2ps.h
? blender/source/blender/src/header_stdout.c
? blender/tools/Blender.pyc
? blender/tools/__init__.pyc
? blender/tools/bcolors.pyc
? blender/tools/btools.pyc
U blender/SConstruct
RCS file: /cvsroot/bf-blender/blender/config/linux2-config.py,v
retrieving revision 1.13
retrieving revision 1.14
Merging differences between 1.13 and 1.14 into linux2-config.py
M blender/config/linux2-config.py
U blender/extern/bullet/Bullet/BroadphaseCollision/Dispatcher.h
U blender/extern/bullet/Bullet/BroadphaseCollision/SimpleBroadphase.cpp
U blender/extern/bullet/Bullet/CollisionDispatch/CollisionDispatcher.cpp
U blender/extern/bullet/Bullet/CollisionDispatch/CollisionDispatcher.h
U blender/extern/bullet/Bullet/CollisionDispatch/CollisionObject.h
U blender/extern/bullet/Bullet/CollisionDispatch/CollisionWorld.cpp
U blender/extern/bullet/Bullet/CollisionDispatch/CollisionWorld.h
U blender/extern/bullet/Bullet/CollisionDispatch/ConvexConcaveCollisionAlgorithm.cpp
U blender/extern/bullet/Bullet/CollisionDispatch/ConvexConvexAlgorithm.cpp
U blender/extern/bullet/Bullet/CollisionDispatch/ManifoldResult.cpp
U blender/extern/bullet/Bullet/CollisionShapes/ConvexTriangleCallback.cpp
U blender/extern/bullet/Bullet/CollisionShapes/ConvexTriangleCallback.h
U blender/extern/bullet/Bullet/NarrowPhaseCollision/GjkPairDetector.cpp
U blender/extern/bullet/Bullet/NarrowPhaseCollision/ManifoldPoint.h
U blender/extern/bullet/Bullet/NarrowPhaseCollision/PersistentManifold.cpp
U blender/extern/bullet/Bullet/NarrowPhaseCollision/PersistentManifold.h
U blender/extern/bullet/Bullet/NarrowPhaseCollision/RaycastCallback.cpp
U blender/extern/bullet/Bullet/NarrowPhaseCollision/RaycastCallback.h
U blender/extern/bullet/BulletDynamics/ConstraintSolver/ContactConstraint.cpp
U blender/extern/bullet/BulletDynamics/ConstraintSolver/ContactConstraint.h
U blender/extern/bullet/BulletDynamics/ConstraintSolver/JacobianEntry.h
U blender/extern/bullet/BulletDynamics/ConstraintSolver/SimpleConstraintSolver.cpp
U blender/extern/bullet/BulletDynamics/ConstraintSolver/SimpleConstraintSolver.h
U blender/extern/bullet/BulletDynamics/Dynamics/RigidBody.cpp
U blender/extern/bullet/BulletDynamics/Dynamics/RigidBody.h
U blender/extern/bullet/Demos/CcdPhysicsDemo/CcdPhysicsDemo.cpp
U blender/extern/bullet/Demos/OpenGL/BMF_Api.cpp
U blender/extern/bullet/Demos/OpenGL/BMF_Api.h
U blender/extern/bullet/Demos/OpenGL/BMF_BitmapFont.cpp
U blender/extern/bullet/Demos/OpenGL/BMF_BitmapFont.h
U blender/extern/bullet/Demos/OpenGL/BMF_FontData.h
U blender/extern/bullet/Demos/OpenGL/BMF_Fonts.h
U blender/extern/bullet/Demos/OpenGL/BMF_Settings.h
U blender/extern/bullet/Demos/OpenGL/BMF_font_helv10.cpp
U blender/extern/bullet/Demos/OpenGL/GlutStuff.cpp
U blender/extern/bullet/Extras/PhysicsInterface/CcdPhysics/CcdPhysicsController.cpp
U blender/extern/bullet/Extras/PhysicsInterface/CcdPhysics/CcdPhysicsController.h
U blender/extern/bullet/Extras/PhysicsInterface/CcdPhysics/CcdPhysicsEnvironment.cpp
U blender/extern/bullet/Extras/PhysicsInterface/CcdPhysics/CcdPhysicsEnvironment.h
U blender/extern/bullet/LinearMath/SimdTransformUtil.h
U blender/extern/bullet/make/msvc_7_0/Bullet3_vc7.vcproj
U blender/intern/bsp/intern/BSP_CSGMesh_CFIterator.h
U blender/intern/decimation/intern/LOD_EdgeCollapser.cpp
U blender/intern/decimation/intern/LOD_MeshPrimitives.cpp
U blender/intern/elbeem/extern/LBM_fluidsim.h
U blender/intern/elbeem/extern/elbeem.h
U blender/intern/elbeem/intern/attributes.cpp
U blender/intern/elbeem/intern/attributes.h
U blender/intern/elbeem/intern/elbeem.cpp
U blender/intern/elbeem/intern/elbeem.h
U blender/intern/elbeem/intern/isosurface.cpp
U blender/intern/elbeem/intern/isosurface.h
U blender/intern/elbeem/intern/ntl_blenderdumper.cpp
U blender/intern/elbeem/intern/ntl_blenderdumper.h
U blender/intern/elbeem/intern/ntl_geometryclass.h
U blender/intern/elbeem/intern/ntl_geometrymodel.cpp
U blender/intern/elbeem/intern/ntl_geometrymodel.h
U blender/intern/elbeem/intern/ntl_geometryobject.cpp
U blender/intern/elbeem/intern/ntl_geometryobject.h
U blender/intern/elbeem/intern/ntl_geometryshader.h
U blender/intern/elbeem/intern/ntl_ray.cpp
U blender/intern/elbeem/intern/ntl_ray.h
U blender/intern/elbeem/intern/ntl_vector3dim.h
U blender/intern/elbeem/intern/ntl_world.cpp
U blender/intern/elbeem/intern/ntl_world.h
U blender/intern/elbeem/intern/parametrizer.cpp
U blender/intern/elbeem/intern/parametrizer.h
U blender/intern/elbeem/intern/particletracer.cpp
U blender/intern/elbeem/intern/particletracer.h
U blender/intern/elbeem/intern/simulation_object.cpp
U blender/intern/elbeem/intern/simulation_object.h
U blender/intern/elbeem/intern/solver_adap.cpp
U blender/intern/elbeem/intern/solver_class.h
U blender/intern/elbeem/intern/solver_init.cpp
U blender/intern/elbeem/intern/solver_interface.cpp
U blender/intern/elbeem/intern/solver_interface.h
RCS file: /cvsroot/bf-blender/blender/intern/elbeem/intern/solver_main.cpp,v
retrieving revision 1.7
retrieving revision 1.9
Merging differences between 1.7 and 1.9 into solver_main.cpp
rcsmerge: warning: conflicts during merge
cvs server: conflicts found in blender/intern/elbeem/intern/solver_main.cpp
C blender/intern/elbeem/intern/solver_main.cpp
U blender/intern/elbeem/intern/solver_relax.h
U blender/intern/elbeem/intern/solver_util.cpp
U blender/intern/elbeem/intern/utilities.cpp
U blender/intern/elbeem/intern/utilities.h
U blender/intern/elbeem/make/msvc_6_0/elbeem.dsp
U blender/intern/elbeem/make/msvc_7_0/elbeem.vcproj
U blender/intern/ghost/intern/GHOST_EventPrinter.cpp
U blender/intern/ghost/intern/GHOST_SystemX11.cpp
U blender/intern/ghost/intern/GHOST_SystemX11.h
U blender/projectfiles/blender/BPY_python/BPY_python.dsp
U blender/projectfiles_vc7/blender/blender.vcproj
U blender/projectfiles_vc7/blender/BPY_python/BPY_python.vcproj
U blender/release/scripts/3ds_export.py
U blender/release/scripts/3ds_import.py
U blender/release/scripts/animation_trajectory.py
U blender/release/scripts/bevel_center.py
cvs server: blender/release/scripts/bvh_export.py is no longer in the repository
cvs server: blender/release/scripts/bvh_import.py is no longer in the repository
U blender/release/scripts/colladaExport14.py
U blender/release/scripts/colladaImport14.py
M blender/release/scripts/hotkeys.py
U blender/release/scripts/image_edit.py
U blender/release/scripts/kmz_ImportWithMesh.py
U blender/release/scripts/md2_export.py
U blender/release/scripts/mesh_boneweight_copy.py
U blender/release/scripts/mesh_poly_reduce.py
U blender/release/scripts/obj_import.py
U blender/release/scripts/uv_auto_layout_tex.py
U blender/release/scripts/vertexpaint_selfshadow_ao.py
U blender/release/scripts/vrml97_export.py
U blender/release/scripts/weightpaint_grow_shrink.py
U blender/release/scripts/bpymodules/BPyImage.py
U blender/release/scripts/bpymodules/BPyMathutils.py
U blender/release/scripts/bpymodules/BPyMesh.py
U blender/release/scripts/bpymodules/BPyMesh_redux.py
U blender/release/scripts/bpymodules/BPyRegistry.py
U blender/release/scripts/bpymodules/colladaImEx/__init__.py
U blender/release/scripts/bpymodules/colladaImEx/collada.py
U blender/release/scripts/bpymodules/colladaImEx/cstartup.py
U blender/release/scripts/bpymodules/colladaImEx/cutils.py
U blender/release/scripts/bpymodules/colladaImEx/translator.py
U blender/release/scripts/bpymodules/colladaImEx/xmlUtils.py
U blender/source/blender/blenkernel/BKE_displist.h
U blender/source/blender/blenkernel/BKE_global.h
U blender/source/blender/blenkernel/BKE_object.h
U blender/source/blender/blenkernel/BKE_scene.h
U blender/source/blender/blenkernel/bad_level_call_stubs/stubs.c
U blender/source/blender/blenkernel/intern/DerivedMesh.c
U blender/source/blender/blenkernel/intern/action.c
U blender/source/blender/blenkernel/intern/armature.c
U blender/source/blender/blenkernel/intern/blender.c
U blender/source/blender/blenkernel/intern/colortools.c
U blender/source/blender/blenkernel/intern/constraint.c
U blender/source/blender/blenkernel/intern/depsgraph.c
U blender/source/blender/blenkernel/intern/displist.c
U blender/source/blender/blenkernel/intern/effect.c
U blender/source/blender/blenkernel/intern/font.c
U blender/source/blender/blenkernel/intern/ipo.c
RCS file: /cvsroot/bf-blender/blender/source/blender/blenkernel/intern/material.c,v
retrieving revision 1.38
retrieving revision 1.39
Merging differences between 1.38 and 1.39 into material.c
rcsmerge: warning: conflicts during merge
cvs server: conflicts found in blender/source/blender/blenkernel/intern/material.c
C blender/source/blender/blenkernel/intern/material.c
U blender/source/blender/blenkernel/intern/mesh.c
RCS file: /cvsroot/bf-blender/blender/source/blender/blenkernel/intern/modifier.c,v
retrieving revision 1.56
retrieving revision 1.59
Merging differences between 1.56 and 1.59 into modifier.c
M blender/source/blender/blenkernel/intern/modifier.c
U blender/source/blender/blenkernel/intern/node.c
U blender/source/blender/blenkernel/intern/node_composite.c
U blender/source/blender/blenkernel/intern/node_shaders.c
U blender/source/blender/blenkernel/intern/object.c
U blender/source/blender/blenkernel/intern/scene.c
U blender/source/blender/blenkernel/intern/writeffmpeg.c
U blender/source/blender/blenlib/BLI_arithb.h
U blender/source/blender/blenlib/intern/arithb.c
RCS file: /cvsroot/bf-blender/blender/source/blender/blenloader/intern/readfile.c,v
retrieving revision 1.254
retrieving revision 1.257
Merging differences between 1.254 and 1.257 into readfile.c
M blender/source/blender/blenloader/intern/readfile.c
M blender/source/blender/blenloader/intern/writefile.c
U blender/source/blender/ftfont/intern/FTF_TTFont.cpp
U blender/source/blender/imbuf/intern/anim.c
U blender/source/blender/include/BDR_editobject.h
M blender/source/blender/include/BIF_butspace.h
U blender/source/blender/include/BIF_editmesh.h
U blender/source/blender/include/BIF_editseq.h
M blender/source/blender/include/BIF_resources.h
M blender/source/blender/include/BIF_spacetypes.h
U blender/source/blender/include/BIF_usiblender.h
M blender/source/blender/include/BSE_editipo.h
M blender/source/blender/include/BSE_headerbuttons.h
M blender/source/blender/include/butspace.h
M blender/source/blender/include/mydevice.h
M blender/source/blender/makesdna/DNA_camera_types.h
RCS file: /cvsroot/bf-blender/blender/source/blender/makesdna/DNA_material_types.h,v
retrieving revision 1.37
retrieving revision 1.38
Merging differences between 1.37 and 1.38 into DNA_material_types.h
rcsmerge: warning: conflicts during merge
cvs server: conflicts found in blender/source/blender/makesdna/DNA_material_types.h
C blender/source/blender/makesdna/DNA_material_types.h
M blender/source/blender/makesdna/DNA_modifier_types.h
U blender/source/blender/makesdna/DNA_object_fluidsim.h
U blender/source/blender/makesdna/DNA_object_types.h
RCS file: /cvsroot/bf-blender/blender/source/blender/makesdna/DNA_scene_types.h,v
retrieving revision 1.67
retrieving revision 1.72
Merging differences between 1.67 and 1.72 into DNA_scene_types.h
M blender/source/blender/makesdna/DNA_scene_types.h
M blender/source/blender/makesdna/DNA_screen_types.h
M blender/source/blender/makesdna/DNA_space_types.h
M blender/source/blender/makesdna/DNA_userdef_types.h
M blender/source/blender/makesdna/DNA_view3d_types.h
M blender/source/blender/makesdna/intern/makesdna.c
C blender/source/blender/python/BPY_menus.c
M blender/source/blender/python/BPY_menus.h
U blender/source/blender/python/api2_2x/BezTriple.c
RCS file: /cvsroot/bf-blender/blender/source/blender/python/api2_2x/Blender.c,v
retrieving revision 1.82
retrieving revision 1.83
Merging differences between 1.82 and 1.83 into Blender.c
M blender/source/blender/python/api2_2x/Blender.c
U blender/source/blender/python/api2_2x/Constraint.c
U blender/source/blender/python/api2_2x/Draw.c
U blender/source/blender/python/api2_2x/Draw.h
U blender/source/blender/python/api2_2x/Image.c
U blender/source/blender/python/api2_2x/Lamp.c
U blender/source/blender/python/api2_2x/Material.c
U blender/source/blender/python/api2_2x/Mesh.c
U blender/source/blender/python/api2_2x/Mesh.h
U blender/source/blender/python/api2_2x/NLA.c
U blender/source/blender/python/api2_2x/NLA.h
U blender/source/blender/python/api2_2x/Object.c
U blender/source/blender/python/api2_2x/Pose.c
U blender/source/blender/python/api2_2x/Pose.h
M blender/source/blender/python/api2_2x/Scene.c
U blender/source/blender/python/api2_2x/Sys.c
U blender/source/blender/python/api2_2x/Text3d.c
M blender/source/blender/python/api2_2x/Window.c
U blender/source/blender/python/api2_2x/gen_utils.h
U blender/source/blender/python/api2_2x/meshPrimitive.c
U blender/source/blender/python/api2_2x/meshPrimitive.h
U blender/source/blender/python/api2_2x/sceneRender.c
M blender/source/blender/python/api2_2x/windowTheme.c
U blender/source/blender/python/api2_2x/doc/API_intro.py
U blender/source/blender/python/api2_2x/doc/Blender.py
U blender/source/blender/python/api2_2x/doc/Constraint.py
U blender/source/blender/python/api2_2x/doc/Draw.py
U blender/source/blender/python/api2_2x/doc/Group.py
U blender/source/blender/python/api2_2x/doc/Lamp.py
U blender/source/blender/python/api2_2x/doc/Material.py
U blender/source/blender/python/api2_2x/doc/Mesh.py
U blender/source/blender/python/api2_2x/doc/MeshPrimitives.py
U blender/source/blender/python/api2_2x/doc/NLA.py
U blender/source/blender/python/api2_2x/doc/Object.py
U blender/source/blender/python/api2_2x/doc/Pose.py
U blender/source/blender/python/api2_2x/doc/Render.py
U blender/source/blender/python/api2_2x/doc/World.py
U blender/source/blender/python/api2_2x/doc/epy_docgen.sh
U blender/source/blender/render/extern/include/RE_pipeline.h
U blender/source/blender/render/extern/include/RE_shader_ext.h
U blender/source/blender/render/intern/include/render_types.h
U blender/source/blender/render/intern/source/convertblender.c
U blender/source/blender/render/intern/source/envmap.c
U blender/source/blender/render/intern/source/initrender.c
RCS file: /cvsroot/bf-blender/blender/source/blender/render/intern/source/pipeline.c,v
retrieving revision 1.52
retrieving revision 1.62
Merging differences between 1.52 and 1.62 into pipeline.c
rcsmerge: warning: conflicts during merge
cvs server: conflicts found in blender/source/blender/render/intern/source/pipeline.c
C blender/source/blender/render/intern/source/pipeline.c
U blender/source/blender/render/intern/source/rendercore.c
U blender/source/blender/render/intern/source/shadbuf.c
U blender/source/blender/render/intern/source/texture.c
U blender/source/blender/render/intern/source/zbuf.c
M blender/source/blender/src/blenderbuttons.c
M blender/source/blender/src/butspace.c
RCS file: /cvsroot/bf-blender/blender/source/blender/src/buttons_editing.c,v
retrieving revision 1.252
retrieving revision 1.254
Merging differences between 1.252 and 1.254 into buttons_editing.c
M blender/source/blender/src/buttons_editing.c
U blender/source/blender/src/buttons_logic.c
U blender/source/blender/src/buttons_object.c
RCS file: /cvsroot/bf-blender/blender/source/blender/src/buttons_scene.c,v
retrieving revision 1.120
retrieving revision 1.128
Merging differences between 1.120 and 1.128 into buttons_scene.c
M blender/source/blender/src/buttons_scene.c
U blender/source/blender/src/buttons_script.c
RCS file: /cvsroot/bf-blender/blender/source/blender/src/buttons_shading.c,v
retrieving revision 1.180
retrieving revision 1.186
Merging differences between 1.180 and 1.186 into buttons_shading.c
rcsmerge: warning: conflicts during merge
cvs server: conflicts found in blender/source/blender/src/buttons_shading.c
C blender/source/blender/src/buttons_shading.c
U blender/source/blender/src/drawipo.c
U blender/source/blender/src/drawnla.c
U blender/source/blender/src/drawnode.c
RCS file: /cvsroot/bf-blender/blender/source/blender/src/drawobject.c,v
retrieving revision 1.272
retrieving revision 1.274
Merging differences between 1.272 and 1.274 into drawobject.c
M blender/source/blender/src/drawobject.c
M blender/source/blender/src/drawscript.c
U blender/source/blender/src/drawseq.c
RCS file: /cvsroot/bf-blender/blender/source/blender/src/drawtext.c,v
retrieving revision 1.58
retrieving revision 1.60
Merging differences between 1.58 and 1.60 into drawtext.c
M blender/source/blender/src/drawtext.c
RCS file: /cvsroot/bf-blender/blender/source/blender/src/drawview.c,v
retrieving revision 1.198
retrieving revision 1.200
Merging differences between 1.198 and 1.200 into drawview.c
rcsmerge: warning: conflicts during merge
cvs server: conflicts found in blender/source/blender/src/drawview.c
C blender/source/blender/src/drawview.c
U blender/source/blender/src/edit.c
M blender/source/blender/src/editimasel.c
RCS file: /cvsroot/bf-blender/blender/source/blender/src/editipo.c,v
retrieving revision 1.95
retrieving revision 1.97
Merging differences between 1.95 and 1.97 into editipo.c
M blender/source/blender/src/editipo.c
U blender/source/blender/src/editipo_mods.c
U blender/source/blender/src/editkey.c
U blender/source/blender/src/editmesh.c
RCS file: /cvsroot/bf-blender/blender/source/blender/src/editmesh_add.c,v
retrieving revision 1.51
retrieving revision 1.53
Merging differences between 1.51 and 1.53 into editmesh_add.c
rcsmerge: warning: conflicts during merge
cvs server: conflicts found in blender/source/blender/src/editmesh_add.c
C blender/source/blender/src/editmesh_add.c
U blender/source/blender/src/editmesh_mods.c
U blender/source/blender/src/editmesh_tools.c
RCS file: /cvsroot/bf-blender/blender/source/blender/src/editnode.c,v
retrieving revision 1.22
retrieving revision 1.24
Merging differences between 1.22 and 1.24 into editnode.c
M blender/source/blender/src/editnode.c
U blender/source/blender/src/editobject.c
RCS file: /cvsroot/bf-blender/blender/source/blender/src/editscreen.c,v
retrieving revision 1.125
retrieving revision 1.127
Merging differences between 1.125 and 1.127 into editscreen.c
M blender/source/blender/src/editscreen.c
U blender/source/blender/src/editseq.c
M blender/source/blender/src/editview.c
M blender/source/blender/src/eventdebug.c
M blender/source/blender/src/filesel.c
U blender/source/blender/src/fluidsim.c
U blender/source/blender/src/hddaudio.c
M blender/source/blender/src/header_buttonswin.c
U blender/source/blender/src/header_image.c
RCS file: /cvsroot/bf-blender/blender/source/blender/src/header_info.c,v
retrieving revision 1.85
retrieving revision 1.88
Merging differences between 1.85 and 1.88 into header_info.c
M blender/source/blender/src/header_info.c
U blender/source/blender/src/header_ipo.c
U blender/source/blender/src/header_node.c
U blender/source/blender/src/header_text.c
U blender/source/blender/src/header_time.c
RCS file: /cvsroot/bf-blender/blender/source/blender/src/header_view3d.c,v
retrieving revision 1.167
retrieving revision 1.171
Merging differences between 1.167 and 1.171 into header_view3d.c
M blender/source/blender/src/header_view3d.c
RCS file: /cvsroot/bf-blender/blender/source/blender/src/headerbuttons.c,v
retrieving revision 1.122
retrieving revision 1.124
Merging differences between 1.122 and 1.124 into headerbuttons.c
rcsmerge: warning: conflicts during merge
cvs server: conflicts found in blender/source/blender/src/headerbuttons.c
C blender/source/blender/src/headerbuttons.c
M blender/source/blender/src/interface.c
U blender/source/blender/src/interface_draw.c
M blender/source/blender/src/outliner.c
RCS file: /cvsroot/bf-blender/blender/source/blender/src/renderwin.c,v
retrieving revision 1.86
retrieving revision 1.90
Merging differences between 1.86 and 1.90 into renderwin.c
M blender/source/blender/src/renderwin.c
M blender/source/blender/src/resources.c
M blender/source/blender/src/screendump.c
U blender/source/blender/src/seqaudio.c
U blender/source/blender/src/seqeffects.c
U blender/source/blender/src/sequence.c
RCS file: /cvsroot/bf-blender/blender/source/blender/src/space.c,v
retrieving revision 1.348
retrieving revision 1.353
Merging differences between 1.348 and 1.353 into space.c
M blender/source/blender/src/space.c
M blender/source/blender/src/spacetypes.c
RCS file: /cvsroot/bf-blender/blender/source/blender/src/toets.c,v
retrieving revision 1.73
retrieving revision 1.77
Merging differences between 1.73 and 1.77 into toets.c
M blender/source/blender/src/toets.c
RCS file: /cvsroot/bf-blender/blender/source/blender/src/toolbox.c,v
retrieving revision 1.128
retrieving revision 1.131
Merging differences between 1.128 and 1.131 into toolbox.c
M blender/source/blender/src/toolbox.c
U blender/source/blender/src/transform.c
U blender/source/blender/src/transform_constraints.c
U blender/source/blender/src/transform_conversions.c
RCS file: /cvsroot/bf-blender/blender/source/blender/src/usiblender.c,v
retrieving revision 1.106
retrieving revision 1.114
Merging differences between 1.106 and 1.114 into usiblender.c
M blender/source/blender/src/usiblender.c
RCS file: /cvsroot/bf-blender/blender/source/blender/src/view.c,v
retrieving revision 1.65
retrieving revision 1.66
Merging differences between 1.65 and 1.66 into view.c
M blender/source/blender/src/view.c
U blender/source/blender/src/vpaint.c
U blender/source/blender/src/writeavicodec.c
RCS file: /cvsroot/bf-blender/blender/source/blender/src/writeimage.c,v
retrieving revision 1.20
retrieving revision 1.24
Merging differences between 1.20 and 1.24 into writeimage.c
rcsmerge: warning: conflicts during merge
cvs server: conflicts found in blender/source/blender/src/writeimage.c
C blender/source/blender/src/writeimage.c
U blender/source/blender/yafray/YafRay_Api.h
U blender/source/blender/yafray/intern/api.cpp
U blender/source/blender/yafray/intern/export_File.cpp
U blender/source/blender/yafray/intern/export_Plugin.cpp
U blender/source/blender/yafray/intern/export_Plugin.h
U blender/source/blender/yafray/intern/yafray_Render.cpp
U blender/source/blender/yafray/intern/yafray_Render.h
M blender/source/creator/creator.c
U blender/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
U blender/source/gameengine/Converter/BL_ArmatureObject.h
U blender/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
U blender/source/gameengine/Converter/KX_ConvertSensors.cpp
U blender/source/gameengine/GameLogic/SCA_IObject.h
U blender/source/gameengine/GameLogic/SCA_IScene.h
U blender/source/gameengine/GameLogic/SCA_PropertySensor.cpp
U blender/source/gameengine/GameLogic/SCA_PythonController.cpp
U blender/source/gameengine/GameLogic/SCA_PythonController.h
U blender/source/gameengine/GamePlayer/ActiveX/BlenderPlayerCtl.cpp
U blender/source/gameengine/GamePlayer/common/GPC_RenderTools.cpp
U blender/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
U blender/source/gameengine/Ketsji/BL_Texture.cpp
U blender/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
U blender/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
U blender/source/gameengine/Ketsji/KX_KetsjiEngine.h
U blender/source/gameengine/Ketsji/KX_NearSensor.cpp
U blender/source/gameengine/Ketsji/KX_PyConstraintBinding.cpp
U blender/source/gameengine/Ketsji/KX_PythonInit.cpp
U blender/source/gameengine/Ketsji/KX_PythonInit.h
U blender/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.cpp
U blender/source/gameengine/Ketsji/KX_Scene.cpp
U blender/source/gameengine/Ketsji/KX_Scene.h
U blender/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.cpp
U blender/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
U blender/source/gameengine/Physics/Bullet/CcdPhysicsController.h
U blender/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
U blender/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h
U blender/source/gameengine/Physics/common/PHY_IPhysicsEnvironment.h
U blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.cpp
U blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.h
U blender/source/gameengine/SceneGraph/SG_Node.cpp
ln: `current-cvs/blender': File exists
########################################################
diff cvs
########################################################
                                                            

Vizzy!