[tuhopuu-devel] Re: [tuhopuu-cvs] CVS commit: tuhopuu2/source/blender/blenlib/intern storage.c

[Chris Want]

Yeah, merging tends to change the version numbers to 1.1.1.x rather
than 1.x.

I sure don't understand this stuff. The web stuff doesn't seem to
understand it either.

Chris

> Okay, this is not what I changed, I only got rid of the <malloc.h>
> stuff. The last version before this was 1.1.1.4. Was the merge
> unfinished, or did I overwrite head? cvs status doesn't report any
> sticky flags. Another thing zr noticed is that it's diffing against the
> wrong revision. The diff between 1.1.1.4 and 1.2 is exactly what I
> locally changed, but I'm not sure why it's 1.2 and not 1.1.1.5.
> 
> Time to sleep.
> 
> Wouter
> _______________________________________________
> tuhopuu-devel mailing list
> tuhopuu-devel@blender.org
> http://www.blender.org/mailman/listinfo/tuhopuu-devel