master branch
master branch
- Subject: master branch
- From: Jeremy Huddleston <email@hidden>
- Date: Thu, 22 Nov 2007 00:45:36 -0800
Hi Ben,
I've finished cherry picking changes from xorg-server-1.2-apple into
master. There are still plenty of variances between the two
branches. Just looking in hw/darwin, the main offenders are below.
You can see the diffs by doing 'git diff master xorg-server-1.2-apple
<file>' ... can you sort through these and try to resolve the
differences between 1.2-apple and master. I'd like to try to get hw/
darwin (and hopefully miext/rootless) synced up as much as possible
between the two branches.
--Jeremy
quartz/X11Application.m:
Looks mostly like reformatting, but I didn't want to sift through it
all...
apple/bundle-main.c:
Looks like some xcb stuff in master didn't get into 1.2-apple and some
other changes in 1.2-apple didn't get in master.
darwin.c:
Looks like backStorage changes weren't rolled into master, and I think
you rolled this change into a big commit to our branch, so I can't
cherry-pick. Is there a reason this isn't in master?
darwinKeyboard.c:
Missing DarwinModifierNXMaskToNXKeyCode, DarwinModifierNXMaskTostring
darwinEvents.c:
Many conflicts between the two... which is right? I ended up not
cherry-picking these commits because of the discrepancies:
stuck modifier key attempt 2:
http://gitweb.freedesktop.org/?p=xorg/xserver.git;a=commit;h=ef290201d6d316ed2cebb9714e0f979ba7dbd816
null pointer:
http://gitweb.freedesktop.org/?p=xorg/xserver.git;a=commit;h=40be575058a1d5a8c3e77d2f1bbf242f19dd1b65
DEBUG_LOG:
http://gitweb.freedesktop.org/?p=xorg/xserver.git;a=commit;h=65a717fd7b5855558b3807ab94b70e8c1d47c855
more debugging:
http://gitweb.freedesktop.org/?p=xorg/xserver.git;a=commit;h=815bf67416f65f935fdadd4640e59b5443d33ef9
_______________________________________________
Do not post admin requests to the list. They will be ignored.
X11-users mailing list (email@hidden)
This email sent to email@hidden