xserver: Branch 'master' - 9 commits

[Keith Packard]

On Thu, 19 Apr 2012 22:29:48 -0700, Jeremy Huddleston <jeremyhu at apple.com> wrote:

> I just noticed that the machine I was on was tracking the wrong
> master, and this was pushed to origin instead of ~jeremyhu/master.

btw, if anyone else does this, it's easy to fix if you've got the
'correct' master around somewhere, just 'git push -f origin master' to
re-write the branch. I'll (obviously) catch this the next time I push to
master, but there's no particular reason to wait for me to repair it,
and having it fixed before I notice is even nicer. Of course, sending
out a nice 'mea culpa' email is appreciated in case someone has pulled
the wrong master and gets a strange 'forced update' the next them around.

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