[Xorg] Egbert moves us back to HEAD

[Roland Mainz]

Keith Packard wrote:
> Egbert has managed to merge CVS so that we're now able to do regular
> development on the HEAD of the CVS tree.
> 
> As it was late at night, he asked that I check to make sure things were
> transferred correctly.
> 
> I checked out two trees, one HEAD and one XORG-CURRENT
> Then I compared the trees.  Almost all of the differences were
> changes in CVS tags (which was expected).  I saw a few other changes, the
> ChangeLog was expected, but the chanages to ttf2pt1.1 and vmware/vmware.c
> were a surprise.  I think they're OK, but if someone else knows better,
> please let us know.

Erm... I did not get any commit emails... how was the merge done ? Dark
magic ? :)

----

Bye,
Roland

-- 
  __ .  . __
 (o.\ \/ /.o) roland.mainz at nrubsig.org
  \__\/\/__/  MPEG specialist, C&&JAVA&&Sun&&Unix programmer
  /O /==\ O\  TEL +49 2426 901568 FAX +49 2426 901569
 (;O/ \/ \O;)