aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* Merge branch 'uli42-pr/update_os' into 3.6.xMihai Moldovan2018-02-274-9/+7
|\
| * Lift os to XORG-7_1 state - non-functional changes onlyUlrich Sibiller2018-02-271-0/+1
| * Lift os to XORG-7_1 stateUlrich Sibiller2018-02-273-9/+6
|/
* Remove unused X11R4 DDX compatibility function miClipNotify.Mihai Moldovan2018-02-272-84/+0
* Merge branch 'uli42-pr/update_mi' into 3.6.xMihai Moldovan2018-02-2711-75/+45
|\
| * Lift mi to xorg-xserver-7.1/1.1.0 state - non-functional changes onlyUlrich Sibiller2018-02-272-2/+2
| * Lift mi to xorg-xserver-7.1/1.1.0 stateUlrich Sibiller2018-02-278-72/+41
| * Lift miext to xorg-xserver-7.1/1.1.10 stateUlrich Sibiller2018-02-272-1/+2
|/
* Merge branch 'uli42-pr/update_record' into 3.6.xMihai Moldovan2018-02-272-403/+76
|\
| * Lift record to xorg-server-1.4.2 stateUlrich Sibiller2018-02-271-4/+4
| * Lift record to xorg-server-1.2.0/xorg-server-1.3.0.0 state - non-functional c...Ulrich Sibiller2018-02-271-53/+22
| * Lift record to xorg-server-1.2.0/xorg-server-1.3.0.0 stateUlrich Sibiller2018-02-271-222/+0
| * Lift record to xorg-xserver-7.1/1.1.0 state - non-functional changes onlyUlrich Sibiller2018-02-271-115/+43
| * Lift record to xorg-xserver-7.1/1.1.0 stateUlrich Sibiller2018-02-271-9/+7
|/
* Merge branch 'sunweaver-pr/version-cmdline-option' into 3.6.xMihai Moldovan2018-02-2731-103/+124
|\
| * hw/nxagent/: Stop using non-portable '__progname', set up our own 'nxagentPro...Mike Gabriel2018-02-263-7/+9
| * hw/nxagent/: Use <function>(void) rather than <function>().Mike Gabriel2018-02-2628-94/+94
| * nxagent/Args.c: Mention new -options cmdline parameter in usage info.Simon Matter2018-02-261-0/+1
| * nxagent: Print correct application in usage message.Simon Matter2018-02-261-0/+5
| * nxagent: Add -version cmdline option.Simon Matter2018-02-264-4/+17
|/
* nx-libs.spec: also package extensions/shapeconst.h in RPM packages.Mihai Moldovan2018-02-261-0/+1
* Merge branch 'uli42-pr/update_dbe' into 3.6.xMihai Moldovan2018-02-265-141/+72
|\
| * dbe: add NXAGENT_SERVER guard for DixLookupUlrich Sibiller2018-02-262-0/+32
| * Lift dbe to xorg-xserver-1.4.2 state - non-functional changes onlyUlrich Sibiller2018-02-262-9/+0
| * Lift dbe to xorg-xserver-1.4.2 stateUlrich Sibiller2018-02-263-50/+4
| * Lift dbe to xorg-xserver-7.1/1.1.0 state - non-functional changes onlyUlrich Sibiller2018-02-262-86/+34
| * Lift dbe to xorg-xserver-7.1/1.1.0 stateUlrich Sibiller2018-02-262-3/+9
|/
* debian/nx-x11proto-xext-dev.install: install new file extensions/shapeconst.h.Mihai Moldovan2018-02-261-0/+1
* Merge branch 'uli42-pr/update_dix' into 3.6.xMihai Moldovan2018-02-2626-131/+328
|\
| * Transfer previous dix changes into hw/nxagentUlrich Sibiller2018-02-261-21/+31
| * Lift dix to xorg-xserver-1.3.0.0 state - non-functional changes onlyUlrich Sibiller2018-02-264-10/+5
| * Lift dix to xorg-xserver-1.3.0.0 stateUlrich Sibiller2018-02-2618-85/+184
| * Lift dix to xorg-xserver-7.1/1.1.0 state - non-functional changes onlyUlrich Sibiller2018-02-263-1/+24
| * Lift dix to xorg-xserver-7.1/1.1.0 stateUlrich Sibiller2018-02-269-14/+84
|/
* Merge branch 'uli42-pr/update_xfixes' into 3.6.xMihai Moldovan2018-02-2612-32/+572
|\
| * Lift XFIXES to xorg-xserver-1.4.2 state - non-functional changes onlyUlrich Sibiller2018-02-267-15/+1
| * Lift XFIXES to xorg-xserver-1.4.2 stateUlrich Sibiller2018-02-266-6/+46
| * Lift XFIXES to xorg-xserver-7.1/1.1.0 state (XFIXES 4.0) - non-functional cha...Ulrich Sibiller2018-02-269-12/+114
| * Lift XFIXES to xorg-xserver-7.1/1.1.0 state (XFIXES 4.0)Ulrich Sibiller2018-02-268-9/+421
|/
* Merge branch 'sunweaver-pr/nomagicpixel' into 3.6.xMihai Moldovan2018-02-268-2/+38
|\
| * nxagent: Add support for optionally enabling/disabling the magic pixel feature.Mike Gabriel2018-02-268-2/+38
|/
* Merge branch 'uli42-pr/update_xi' into arctica-3.6.xMihai Moldovan2018-02-2674-4095/+3146
|\
| * Xi: change () prototypes to (void)Ulrich Sibiller2018-02-262-5/+5
| * Xi/getbmap.c: remove unnecessary castUlrich Sibiller2018-02-261-1/+1
| * Xi: small formatting changes to match Xorg 7.1's XiUlrich Sibiller2018-02-2615-46/+48
| * Xi: reformatUlrich Sibiller2018-02-2637-893/+534
| * Xi: ansify function prototypesUlrich Sibiller2018-02-2673-942/+350
| * Xi: reformat code, ansifyUlrich Sibiller2018-02-2674-2030/+2030
| * Xi: Adapt include sections to match Xorg 7.1Ulrich Sibiller2018-02-2637-168/+168
|/
* debian/control: Don't B-D on build-essential packages.Mike Gabriel2018-02-251-2/+0