[tuhopuu-cvs] CVS commit: tuhopuu3/source/blender/src buttons_editing.c drawimage.c drawview.c header_view3d.c usiblender.c
Chris Want
cwant at ualberta.ca
Sat Jan 8 18:28:36 CET 2005
hos (Chris Want) 2005/01/08 18:28:36 CET
Modified files:
tuhopuu3/source/blender/src buttons_editing.c drawimage.c
drawview.c header_view3d.c
usiblender.c
Log:
Post merge conflict resolution.
Revision Changes Path
1.4 +2 -5 tuhopuu3/source/blender/src/buttons_editing.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/buttons_editing.c.diff?r1=1.3&r2=1.4&cvsroot=tuhopuu>
1.4 +17 -72 tuhopuu3/source/blender/src/drawimage.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/drawimage.c.diff?r1=1.3&r2=1.4&cvsroot=tuhopuu>
1.5 +30 -17 tuhopuu3/source/blender/src/drawview.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/drawview.c.diff?r1=1.4&r2=1.5&cvsroot=tuhopuu>
1.3 +21 -12 tuhopuu3/source/blender/src/header_view3d.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/header_view3d.c.diff?r1=1.2&r2=1.3&cvsroot=tuhopuu>
1.3 +8 -2 tuhopuu3/source/blender/src/usiblender.c
<http://projects.blender.org/viewcvs/viewcvs.cgi/tuhopuu3/source/blender/src/usiblender.c.diff?r1=1.2&r2=1.3&cvsroot=tuhopuu>
More information about the tuhopuu-cvs
mailing list