[Soc-2005-dev] CVS merge

[Nils Thuerey]

Hello,

> Actually, better make it:
> cvs update -jHEAD:2005-07-18 -jHEAD
That seems to work better - no conflicts then... Stupid question, but
what is that command doing? Updating with the version of july 18th? When
I run a "cvs update -jHEAD" afterwards, I get the conflicts again...

Regards,
-> Nils

> 
> (the date should be the day before the merge)
> 
> Regards,
> Chris
> _______________________________________________
> Soc-2005-dev mailing list
> Soc-2005-dev at blender.org
> http://projects.blender.org/mailman/listinfo/soc-2005-dev
> 


-- 

. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .
.                                                                     .
.          Nils Thuerey                                               .
.          LSS, Inf10 - University of Erlangen Nuremberg              .
.          http://www.ntoken.com                                      .
.          http://www10.informatik.uni-erlangen.de/~sinithue/         .
. . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 256 bytes
Desc: OpenPGP digital signature
Url : http://projects.blender.org/pipermail/soc-2005-dev/attachments/20050720/f46ce265/signature.pgp