Re: RELEASE-1 merged into CURRENT

Alan Coopersmith writes:
 > Egbert Eich wrote:
 > > 1. I had the usual spurious conflicts from cvs IDs. Keeping XdotOrg:
 > >    and XFree86: IDs in close vicinity is like calling for trouble.
 > 
 > It appears the previous convention (not always followed) was to have
 > the old XC/TOG/Xorg Id strings at the very top, above the copyrights,
 > and the XFree86 ones below the copyrights.  It sounds like it would
 > be best to keep the XdotOrg at the top, since the XC/TOG/Xorg ones
 > won't be changing any more.
 > 

That's a good point. Unfortunately XFree86 doesn't obey this rule either.
Maybe we should be more flexible about this and put it whereever there
isn't an XFree86 ID string.

Egbert.