~thopiekar/xorg-server/+git/xorg-server-salsa.debian:upstream-ubuntu

Last commit made on 2012-07-17
Get this branch:
git clone -b upstream-ubuntu https://git.launchpad.net/~thopiekar/xorg-server/+git/xorg-server-salsa.debian

Branch merges

Branch information

Recent commits

77de299... by Keith Packard

Bump to version 1.12.99.902

Signed-off-by: Keith Packard <email address hidden>

beeea70... by Keith Packard

Merge remote-tracking branch 'alanc/master'

6e438a0... by Keith Packard

Merge remote-tracking branch 'jturney/master'

75966a4... by Keith Packard

xwin: Clean up os wrappers for System, Popen and Pclose on Windows

Popen and Pclose are never used on Windows, so don't bother to even
try to define them.

System(s) was defined as system(s), but the two users of that
function are in xkb, which carefully redefines that as
Win32System. Move Win32System and Win32TempDir to os/utils.c, renaming
Win32System to be just System, which simplifies the xkb code

Signed-off-by: Keith Packard <email address hidden>
Reviewed-by: Jon TURNEY <email address hidden>

6910280... by Alan Coopersmith

Use C99 designated initializers in DRI2GetParam replies

DRI2GetParam was going through review in parallel with main batch of
C99 initialization changes - sync up now that both have landed.

Signed-off-by: Alan Coopersmith <email address hidden>
Reviewed-by: Keith Packard <email address hidden>

a6c5b8d... by Alan Coopersmith

Use C99 designated initializers in RandR 1.4 extension Events

RandR 1.4 was going through review in parallel with main batch of
C99 initialization changes - sync up now that both have landed.

Signed-off-by: Alan Coopersmith <email address hidden>
Reviewed-by: Keith Packard <email address hidden>

ada04ef... by Alan Coopersmith

Use C99 designated initializers in RandR 1.4 extension Replies

RandR 1.4 was going through review in parallel with main batch of
C99 initialization changes - sync up now that both have landed.

Signed-off-by: Alan Coopersmith <email address hidden>
Reviewed-by: Keith Packard <email address hidden>

fb73f7f... by Alan Coopersmith

Fix two more C99 initialization mistakes using members of same struct

Similar to 34cf559bcf99dad, use temporary variables instead of
referencing members of the struct being initialized in the middle
of the initialization.

Signed-off-by: Alan Coopersmith <email address hidden>
Reviewed-by: Keith Packard <email address hidden>

5884e7d... by Aaron Plattner

xf86: Re-export extension disable flags

These flags were unexported by commit a1d41e311c21eb6627caa0d168e070ceaf90806f,
which moved the declarations around and lost the _X_EXPORT attributes in the
process. Since drivers need these and it's late in the release cycle, just
re-export them for now.

Signed-off-by: Aaron Plattner <email address hidden>
Reviewed-by: Andy Ritger <email address hidden>
Signed-off-by: Keith Packard <email address hidden>

357ec54... by Jon TURNEY

hw/xwin: Refer to xkeyboard-config man page for XKB configuration option values

Also polish the keyboard configuration text a bit
Include man section number in references to setxkbmap
Consistently refer to 'manual page' rather using both that and 'man page'

Signed-off-by: Jon TURNEY <email address hidden>
Reviewed-by: Colin Harrison <email address hidden>