[PULL] Kill libxorg

[Keith Packard]

On Tue, 21 Jun 2011 12:16:39 -0700, Dan Nicholson <dbn.lists at gmail.com> wrote:

> Alright, git://people.freedesktop.org/~dbn/xserver.git no-libxorg has
> been updated. I think it's ready to pull now.

I'm getting a merge conflict in test/.gitignore after Gaetan's updates
to that file. If you can update your branch to deal with that change,
I'll go ahead and merge it to master.

-- 
keith.packard at intel.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
URL: <http://lists.x.org/archives/xorg-devel/attachments/20110622/b3f27a53/attachment.pgp>