xserver git version?

[Marek Chalupa]

Hi,

the xwayland was merged to master branch of xserver 12 days ago (
http://cgit.freedesktop.org/xorg/xserver/commit/?id=6e539d8817f738289dc2dea13d0720116287ab9d
)

I just did:
 $ git reset --hard origin/master

and then configured it with --enable-xwayland.

This way I made it run, I hope it'll help

Regards,
Marek


On 16 April 2014 06:45, Bill Spitzak <spitzak at gmail.com> wrote:

> It looks like the xwayland branch of xserver has disappeared:
>
> $ git pull
> Your configuration specifies to merge with the ref 'xwayland'
> from the remote, but no such ref was fetched.
>
> I tried "git pull origin master" but it produced lots of conflicts, it
> looks like there are many changes for wayland that are not in master.
>
> Any help?
>
> Thanks
>
> _______________________________________________
> wayland-devel mailing list
> wayland-devel at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/wayland-devel
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.freedesktop.org/archives/wayland-devel/attachments/20140416/dfe18691/attachment.html>