kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity
8597925736
blender/release/ui
History
Arystanbek Dyussenov 03d3527ef7 Merge from trunk -r 23000:23968. 
Resolved the 'inconsistent newlines' merge error by updating my svn client.
The error was caused by a bug in svn client (http://subversion.tigris.org/issues/show_bug.cgi?id=3262) that was 
fixed in 1.5.5.

Fixed conflicts in image.c, object_edit.c, wm_operators.c, source/creator/CMakeLists.txt and CMakeLists.txt.
Merge didn't remove some files that were moved/renamed in trunk, svn reported 'Skipped [filename]' on these files.
I removed them with:

svn --force remove release/io
svn --force remove release/ui
svn --force remove source/blender/editors/preview
svn --force remove source/blender/editors/physics/ed_fluidsim.c
svn --force remove source/blender/editors/physics/editparticle.c
svn --force remove source/blender/editors/physics/ed_pointcache.c
svn --force remove source/blender/editors/mesh/mesh_layers.c

Now, before merging into trunk, need to update collada code so it builds ok and fix the possibility to build without 
collada.
2009-10-25 06:53:04 +00:00
..
bpy_ops.py Merge from trunk -r 22040:23000. 2009-10-19 16:20:12 +00:00
buttons_data_armature.py Merge from trunk -r 23000:23968. 2009-10-25 06:53:04 +00:00
buttons_data_bone.py Merge from trunk -r 23000:23968. 2009-10-25 06:53:04 +00:00
buttons_data_camera.py Merge from trunk -r 22040:23000. 2009-10-19 16:20:12 +00:00
buttons_data_curve.py Merge from trunk -r 23000:23968. 2009-10-25 06:53:04 +00:00
buttons_data_empty.py Merge from trunk -r 23000:23968. 2009-10-25 06:53:04 +00:00
buttons_data_lamp.py Merge from trunk -r 22040:23000. 2009-10-19 16:20:12 +00:00
buttons_data_lattice.py Merge from trunk -r 22040:23000. 2009-10-19 16:20:12 +00:00
buttons_data_mesh.py Merge from trunk -r 22040:23000. 2009-10-19 16:20:12 +00:00
buttons_data_metaball.py Merge from trunk -r 22040:23000. 2009-10-19 16:20:12 +00:00
buttons_data_modifier.py Merge from trunk -r 23000:23968. 2009-10-25 06:53:04 +00:00
buttons_data_text.py Merge from trunk -r 23000:23968. 2009-10-25 06:53:04 +00:00
buttons_game.py Merge from trunk -r 22040:23000. 2009-10-19 16:20:12 +00:00
buttons_material.py Merge from trunk -r 22040:23000. 2009-10-19 16:20:12 +00:00
buttons_object_constraint.py Merge from trunk -r 23000:23968. 2009-10-25 06:53:04 +00:00
buttons_object.py Merge from trunk -r 22040:23000. 2009-10-19 16:20:12 +00:00
buttons_particle.py Merge from trunk -r 23000:23968. 2009-10-25 06:53:04 +00:00
buttons_physics_cloth.py Merge from trunk -r 22040:23000. 2009-10-19 16:20:12 +00:00
buttons_physics_field.py Merge from trunk -r 22040:23000. 2009-10-19 16:20:12 +00:00
buttons_physics_fluid.py Merge from trunk -r 22040:23000. 2009-10-19 16:20:12 +00:00
buttons_physics_smoke.py Merge from trunk -r 23000:23968. 2009-10-25 06:53:04 +00:00
buttons_physics_softbody.py Merge from trunk -r 22040:23000. 2009-10-19 16:20:12 +00:00
buttons_scene.py Merge from trunk -r 22040:23000. 2009-10-19 16:20:12 +00:00
buttons_texture.py Merge from trunk -r 22040:23000. 2009-10-19 16:20:12 +00:00
buttons_world.py Merge from trunk -r 22040:23000. 2009-10-19 16:20:12 +00:00
space_buttons.py Merge from trunk -r 22040:23000. 2009-10-19 16:20:12 +00:00
space_console.py Merge from trunk -r 23000:23968. 2009-10-25 06:53:04 +00:00
space_filebrowser.py Merge from trunk -r 22040:23000. 2009-10-19 16:20:12 +00:00
space_image.py Merge from trunk -r 23000:23968. 2009-10-25 06:53:04 +00:00
space_info.py Merge from trunk -r 23000:23968. 2009-10-25 06:53:04 +00:00
space_logic.py Merge from trunk -r 22040:23000. 2009-10-19 16:20:12 +00:00
space_node.py Merge from trunk -r 22040:23000. 2009-10-19 16:20:12 +00:00
space_outliner.py Merge from trunk -r 22040:23000. 2009-10-19 16:20:12 +00:00
space_sequencer.py Merge from trunk -r 23000:23968. 2009-10-25 06:53:04 +00:00
space_text.py Merge from trunk -r 22040:23000. 2009-10-19 16:20:12 +00:00
space_time.py Merge from trunk -r 22040:23000. 2009-10-19 16:20:12 +00:00
space_userpref.py Merge from trunk -r 22040:23000. 2009-10-19 16:20:12 +00:00
space_view3d_toolbar.py Merge from trunk -r 23000:23968. 2009-10-25 06:53:04 +00:00
space_view3d.py Merge from trunk -r 23000:23968. 2009-10-25 06:53:04 +00:00