[tuhopuu-cvs] CVS commit: tuhopuu3/release/text release_228a.txt tuhopuu3/source/blender/blenkernel BKE_osa_types.h tuhopuu3/source/blender/blenlib BLI_arithb.h tuhopuu3/source/blender/blenlib/intern arithb.c tuhopuu3/source/blender/render/intern/include old_zbuffer_types.h pixelblending_types.h render_intern.h ...
Chris Want
cwant at ualberta.ca
Sun Jan 2 23:11:50 CET 2005
hos (Chris Want) 2005/01/02 23:11:50 CET
Modified files:
tuhopuu3/source/blender/blenlib BLI_arithb.h
tuhopuu3/source/blender/blenlib/intern arithb.c
tuhopuu3/source/blender/src drawimage.c drawobject.c
drawview.c editobject.c editseq.c
header_image.c
Removed files:
tuhopuu3/release/text release_228a.txt
tuhopuu3/source/blender/blenkernel BKE_osa_types.h
tuhopuu3/source/blender/render/intern/include
old_zbuffer_types.h
pixelblending_types.h
render_intern.h
rendercore_int.h
vanillaRenderPipe_int.h
zbuf_int.h
Log:
Post merge conflict resolution
Revision Changes Path
1.3 +5 -1 tuhopuu3/source/blender/blenlib/BLI_arithb.h
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/blenlib/BLI_arithb.h.diff?r1=1.2&r2=1.3&cvsroot=tuhopuu>
1.3 +36 -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.2&r2=1.3&cvsroot=tuhopuu>
1.3 +2 -2 tuhopuu3/source/blender/src/drawimage.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/drawimage.c.diff?r1=1.2&r2=1.3&cvsroot=tuhopuu>
1.5 +3 -3 tuhopuu3/source/blender/src/drawobject.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/drawobject.c.diff?r1=1.4&r2=1.5&cvsroot=tuhopuu>
1.4 +5 -265 tuhopuu3/source/blender/src/drawview.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/drawview.c.diff?r1=1.3&r2=1.4&cvsroot=tuhopuu>
1.3 +4 -3 tuhopuu3/source/blender/src/editobject.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editobject.c.diff?r1=1.2&r2=1.3&cvsroot=tuhopuu>
1.3 +2 -1 tuhopuu3/source/blender/src/editseq.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/editseq.c.diff?r1=1.2&r2=1.3&cvsroot=tuhopuu>
1.4 +2 -1 tuhopuu3/source/blender/src/header_image.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/header_image.c.diff?r1=1.3&r2=1.4&cvsroot=tuhopuu>
More information about the tuhopuu-cvs
mailing list