On Mon, Jul 08, 2002, Bill Janssen wrote: > I've checked in the fix for width and height consideration to the 1.2 branch.
Great. I will make a new beta release tomorrow. > Now how do I get my version of ImageParser.py back to the main branch? Could use "cvs update -j rev" on the file to merge the differences. I prefer to have more control over the merge, so I use a tool called dirdiff, http://pserver.samba.org/cgi-bin/cvsweb/dirdiff/ /Mike
