well, I figured it would take a long time, but thankfully Petter and I mostly touched nonoverlapping areas of the code. The merge is done on my machine here -- javac works (mostly) in both 1.1 and 1.2 forms. The AWT tests work as well as they did previously (with the 1.1 classes.zip). I'm fairly certain there has been no regression wrt 1.1 features/stability, and there is definitely additional functionality wrt the 1.2 stuff. I'll check in the stuff (after I return home) on sunday/monday. Chris
