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?
