[tuhopuu-cvs] CVS commit: tuhopuu3/doc merge-howto-tuhopuu3.txt tuhopuu3/source/blender/blenkernel BKE_bad_level_calls.h BKE_displist.h BKE_font.h tuhopuu3/source/blender/blenkernel/bad_level_call_stubs stubs.c tuhopuu3/source/blender/blenkernel/intern displist.c font.c tuhopuu3/source/blender/blenloader/intern ...
Chris Want
cwant at ualberta.ca
Tue Sep 6 01:56:30 CEST 2005
hos (Chris Want) 2005/09/06 01:56:30 CEST
Modified files:
tuhopuu3/doc merge-howto-tuhopuu3.txt
tuhopuu3/source/blender/blenkernel BKE_bad_level_calls.h
BKE_displist.h BKE_font.h
tuhopuu3/source/blender/blenkernel/bad_level_call_stubs
stubs.c
tuhopuu3/source/blender/blenkernel/intern displist.c font.c
tuhopuu3/source/blender/blenloader/intern readfile.c
tuhopuu3/source/blender/include blendef.h butspace.h
tuhopuu3/source/blender/makesdna DNA_action_types.h
DNA_curve_types.h
tuhopuu3/source/blender/src buttons_editing.c buttons_object.c
editfont.c editmesh_tools.c
editsima.c headerbuttons.c
interface.c
transform_constraints.c
transform_conversions.c
transform_generics.c
transform_manipulator.c
Log:
Post-merge conflict resolution
Revision Changes Path
1.36 +2 -2 tuhopuu3/doc/merge-howto-tuhopuu3.txt
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/doc/merge-howto-tuhopuu3.txt.diff?r1=1.35&r2=1.36&cvsroot=tuhopuu>
1.6 +5 -1 tuhopuu3/source/blender/blenkernel/BKE_bad_level_calls.h
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenkernel/BKE_bad_level_calls.h.diff?r1=1.5&r2=1.6&cvsroot=tuhopuu>
1.14 +1 -0 tuhopuu3/source/blender/blenkernel/BKE_displist.h
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenkernel/BKE_displist.h.diff?r1=1.13&r2=1.14&cvsroot=tuhopuu>
1.6 +1 -1 tuhopuu3/source/blender/blenkernel/BKE_font.h
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenkernel/BKE_font.h.diff?r1=1.5&r2=1.6&cvsroot=tuhopuu>
1.13 +3 -1 tuhopuu3/source/blender/blenkernel/bad_level_call_stubs/stubs.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenkernel/bad_level_call_stubs/stubs.c.diff?r1=1.12&r2=1.13&cvsroot=tuhopuu>
1.38 +42 -0 tuhopuu3/source/blender/blenkernel/intern/displist.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenkernel/intern/displist.c.diff?r1=1.37&r2=1.38&cvsroot=tuhopuu>
1.18 +120 -24 tuhopuu3/source/blender/blenkernel/intern/font.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenkernel/intern/font.c.diff?r1=1.17&r2=1.18&cvsroot=tuhopuu>
1.40 +2 -2 tuhopuu3/source/blender/blenloader/intern/readfile.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenloader/intern/readfile.c.diff?r1=1.39&r2=1.40&cvsroot=tuhopuu>
1.22 +1 -0 tuhopuu3/source/blender/include/blendef.h
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/include/blendef.h.diff?r1=1.21&r2=1.22&cvsroot=tuhopuu>
1.25 +3 -1 tuhopuu3/source/blender/include/butspace.h
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/include/butspace.h.diff?r1=1.24&r2=1.25&cvsroot=tuhopuu>
1.7 +2 -2 tuhopuu3/source/blender/makesdna/DNA_action_types.h
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/makesdna/DNA_action_types.h.diff?r1=1.6&r2=1.7&cvsroot=tuhopuu>
1.6 +3 -3 tuhopuu3/source/blender/makesdna/DNA_curve_types.h
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/makesdna/DNA_curve_types.h.diff?r1=1.5&r2=1.6&cvsroot=tuhopuu>
1.58 +107 -56 tuhopuu3/source/blender/src/buttons_editing.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/buttons_editing.c.diff?r1=1.57&r2=1.58&cvsroot=tuhopuu>
1.42 +54 -4 tuhopuu3/source/blender/src/buttons_object.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/buttons_object.c.diff?r1=1.41&r2=1.42&cvsroot=tuhopuu>
1.18 +17 -5 tuhopuu3/source/blender/src/editfont.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editfont.c.diff?r1=1.17&r2=1.18&cvsroot=tuhopuu>
1.20 +75 -7 tuhopuu3/source/blender/src/editmesh_tools.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editmesh_tools.c.diff?r1=1.19&r2=1.20&cvsroot=tuhopuu>
1.20 +1 -1 tuhopuu3/source/blender/src/editsima.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editsima.c.diff?r1=1.19&r2=1.20&cvsroot=tuhopuu>
1.25 +1 -1 tuhopuu3/source/blender/src/headerbuttons.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/headerbuttons.c.diff?r1=1.24&r2=1.25&cvsroot=tuhopuu>
1.37 +8 -1 tuhopuu3/source/blender/src/interface.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/interface.c.diff?r1=1.36&r2=1.37&cvsroot=tuhopuu>
1.33 +1 -1 tuhopuu3/source/blender/src/transform_constraints.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/transform_constraints.c.diff?r1=1.32&r2=1.33&cvsroot=tuhopuu>
1.23 +2 -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.22&r2=1.23&cvsroot=tuhopuu>
1.33 +1 -0 tuhopuu3/source/blender/src/transform_generics.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/transform_generics.c.diff?r1=1.32&r2=1.33&cvsroot=tuhopuu>
1.29 +25 -9 tuhopuu3/source/blender/src/transform_manipulator.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/transform_manipulator.c.diff?r1=1.28&r2=1.29&cvsroot=tuhopuu>
More information about the tuhopuu-cvs
mailing list