[Xorg] Egbert moves us back to HEAD

[Keith Packard]

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.

-keith

-------

diff -r xc-XORG-CURRENT/ChangeLog xc/ChangeLog
0a1,3
> 2004-04-23 Egbert Eich <eich at freedesktop.org>
>       Merging XORG-CURRENT into trunk
>      

-------

diff -r xc-XORG-CURRENT/extras/ttf2pt1/ttf2pt1.1 xc/extras/ttf2pt1/ttf2pt1.1
2c2
< ''' $RCSfile: ttf2pt1.1,v $$Revision: 1.1.4.1 $$Date: 2004/04/21 10:03:13 $
---
> ''' $RCSfile: ttf2pt1.1,v $$Revision: 1.2 $$Date: 2004/04/23 18:42:57 $
4a5,8
> ''' Revision 1.2  2004/04/23 18:42:57  eich
> ''' 2004-04-23 Egbert Eich <eich at freedesktop.org>
> '''         Merging XORG-CURRENT into trunk
> '''

-------

diff -r xc-XORG-CURRENT/programs/Xserver/hw/xfree86/drivers/vmware/vmware.c xc/programs/Xserver/hw/xfree86/drivers/vmware/vmware.c
68c68
<     "." VMW_STRING(VMWARE_PATCHLEVEL) " - build=$Name: XORG-CURRENT $\n";
---
>     "." VMW_STRING(VMWARE_PATCHLEVEL) " - build=$Name:  $\n";
329c329
<  *      Rewrites the given string, removing the $Name: XORG-CURRENT $, and
---
>  *      Rewrites the given string, removing the $Name:  $, and


-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 228 bytes
Desc: not available
URL: <http://lists.x.org/archives/xorg/attachments/20040423/7cd270d8/attachment.pgp>