On Tue, 21 Jun 2011 12:16:39 -0700, Dan Nicholson <[email protected]> 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.

-- 
[email protected]

Attachment: pgpskEhYhLG5H.pgp
Description: PGP signature

_______________________________________________
[email protected]: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel

Reply via email to