[tuhopuu-cvs] CVS commit: tuhopuu3/doc merge-howto-tuhopuu3.txt tuhopuu3/intern/bmfont/intern BMF_BitmapFont.cpp tuhopuu3/make/xc_blender/xc_blender.xcode project.pbxproj tuhopuu3/projectfiles/blender/src BL_src.dsp tuhopuu3/source nan_compile.mk tuhopuu3/source/blender/blenkernel/intern scene.c ...
Chris Want
cwant at ualberta.ca
Mon Apr 25 03:27:28 CEST 2005
hos (Chris Want) 2005/04/25 03:27:28 CEST
Modified files:
tuhopuu3/doc merge-howto-tuhopuu3.txt
tuhopuu3/intern/bmfont/intern BMF_BitmapFont.cpp
tuhopuu3/make/xc_blender/xc_blender.xcode project.pbxproj
tuhopuu3/projectfiles/blender/src BL_src.dsp
tuhopuu3/source nan_compile.mk
tuhopuu3/source/blender/blenkernel/intern scene.c
tuhopuu3/source/blender/blenlib/intern arithb.c
tuhopuu3/source/blender/blenloader/intern readfile.c
tuhopuu3/source/blender/include butspace.h
tuhopuu3/source/blender/makesdna DNA_camera_types.h
DNA_object_types.h
DNA_scene_types.h
DNA_userdef_types.h
tuhopuu3/source/blender/python/api2_2x windowTheme.c
tuhopuu3/source/blender/render SConscript
tuhopuu3/source/blender/src butspace.c buttons_editing.c
buttons_object.c buttons_scene.c
editipo.c space.c transform.c
transform_constraints.c
transform_conversions.c
transform_generics.c
transform_manipulator.c
usiblender.c
Log:
Post-merge conflict resolution
Revision Changes Path
1.17 +4 -4 tuhopuu3/doc/merge-howto-tuhopuu3.txt
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/doc/merge-howto-tuhopuu3.txt.diff?r1=1.16&r2=1.17&cvsroot=tuhopuu>
1.10 +1 -1 tuhopuu3/intern/bmfont/intern/BMF_BitmapFont.cpp
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/intern/bmfont/intern/BMF_BitmapFont.cpp.diff?r1=1.9&r2=1.10&cvsroot=tuhopuu>
1.5 +54 -0 tuhopuu3/make/xc_blender/xc_blender.xcode/project.pbxproj
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/make/xc_blender/xc_blender.xcode/project.pbxproj.diff?r1=1.4&r2=1.5&cvsroot=tuhopuu>
1.8 +5 -1 tuhopuu3/projectfiles/blender/src/BL_src.dsp
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/projectfiles/blender/src/BL_src.dsp.diff?r1=1.7&r2=1.8&cvsroot=tuhopuu>
1.6 +1 -1 tuhopuu3/source/nan_compile.mk
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/nan_compile.mk.diff?r1=1.5&r2=1.6&cvsroot=tuhopuu>
1.7 +6 -0 tuhopuu3/source/blender/blenkernel/intern/scene.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenkernel/intern/scene.c.diff?r1=1.6&r2=1.7&cvsroot=tuhopuu>
1.15 +0 -1 tuhopuu3/source/blender/blenlib/intern/arithb.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenlib/intern/arithb.c.diff?r1=1.14&r2=1.15&cvsroot=tuhopuu>
1.13 +14 -11 tuhopuu3/source/blender/blenloader/intern/readfile.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenloader/intern/readfile.c.diff?r1=1.12&r2=1.13&cvsroot=tuhopuu>
1.11 +7 -3 tuhopuu3/source/blender/include/butspace.h
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/include/butspace.h.diff?r1=1.10&r2=1.11&cvsroot=tuhopuu>
1.3 +3 -2 tuhopuu3/source/blender/makesdna/DNA_camera_types.h
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/makesdna/DNA_camera_types.h.diff?r1=1.2&r2=1.3&cvsroot=tuhopuu>
1.7 +7 -2 tuhopuu3/source/blender/makesdna/DNA_object_types.h
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/makesdna/DNA_object_types.h.diff?r1=1.6&r2=1.7&cvsroot=tuhopuu>
1.10 +5 -1 tuhopuu3/source/blender/makesdna/DNA_scene_types.h
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/makesdna/DNA_scene_types.h.diff?r1=1.9&r2=1.10&cvsroot=tuhopuu>
1.11 +2 -2 tuhopuu3/source/blender/makesdna/DNA_userdef_types.h
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/makesdna/DNA_userdef_types.h.diff?r1=1.10&r2=1.11&cvsroot=tuhopuu>
1.3 +5 -2 tuhopuu3/source/blender/python/api2_2x/windowTheme.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/python/api2_2x/windowTheme.c.diff?r1=1.2&r2=1.3&cvsroot=tuhopuu>
1.3 +1 -0 tuhopuu3/source/blender/render/SConscript
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/render/SConscript.diff?r1=1.2&r2=1.3&cvsroot=tuhopuu>
1.3 +1 -1 tuhopuu3/source/blender/src/butspace.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/butspace.c.diff?r1=1.2&r2=1.3&cvsroot=tuhopuu>
1.25 +36 -14 tuhopuu3/source/blender/src/buttons_editing.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/buttons_editing.c.diff?r1=1.24&r2=1.25&cvsroot=tuhopuu>
1.23 +17 -2 tuhopuu3/source/blender/src/buttons_object.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/buttons_object.c.diff?r1=1.22&r2=1.23&cvsroot=tuhopuu>
1.20 +80 -4 tuhopuu3/source/blender/src/buttons_scene.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/buttons_scene.c.diff?r1=1.19&r2=1.20&cvsroot=tuhopuu>
1.12 +17 -0 tuhopuu3/source/blender/src/editipo.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editipo.c.diff?r1=1.11&r2=1.12&cvsroot=tuhopuu>
1.46 +43 -39 tuhopuu3/source/blender/src/space.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/space.c.diff?r1=1.45&r2=1.46&cvsroot=tuhopuu>
1.26 +21 -4 tuhopuu3/source/blender/src/transform.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/transform.c.diff?r1=1.25&r2=1.26&cvsroot=tuhopuu>
1.21 +34 -33 tuhopuu3/source/blender/src/transform_constraints.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/transform_constraints.c.diff?r1=1.20&r2=1.21&cvsroot=tuhopuu>
1.4 +4 -1 tuhopuu3/source/blender/src/transform_conversions.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/transform_conversions.c.diff?r1=1.3&r2=1.4&cvsroot=tuhopuu>
1.19 +5 -4 tuhopuu3/source/blender/src/transform_generics.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/transform_generics.c.diff?r1=1.18&r2=1.19&cvsroot=tuhopuu>
1.13 +115 -246 tuhopuu3/source/blender/src/transform_manipulator.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/transform_manipulator.c.diff?r1=1.12&r2=1.13&cvsroot=tuhopuu>
1.10 +1 -2 tuhopuu3/source/blender/src/usiblender.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/usiblender.c.diff?r1=1.9&r2=1.10&cvsroot=tuhopuu>
More information about the tuhopuu-cvs
mailing list