Xorg 7.1 and Xgl

[David Reveman]

On Wed, 2006-03-22 at 01:10 +0100, Christian Parpart wrote: 
> Hi all,
> 
> simple stupid question: will Xgl make its way into the Xorg 7.1 release?
> It at least looks like it's about to be merged to HEAD any time soon.
> So, it might be part (in theory) of 7.1 release as well, in fact, it's still 
> open wether compiz/glxcompmgr/... will be part of this boundle as well.

Yesterday I merged as much code as possible from head into the xgl
branch. However, there's still some quite large changes in the xgl
branch but except for a swap buffers thing in GL/glx/glxcmds.c and a GLX
initialization thing in mi/miinitext.c, I believe that all changes just
need to be reviewed before they can go into head.

Merging xgl into head before the end of the day and making it into the
Xorg 7.1 release will be hard.

-David