aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'sunweaver-pr/mesa-patching-with-quilt' into 3.6.xMihai Moldovan2017-04-062-0/+37
|\
| * Mesa subtree: Add quilt based patch system for bundled Mesa.Mike Gabriel2017-04-052-0/+37
|/
* roll-tarball.sh: Fix ChangeLog creation, always create ChangeLog for the CHEC...Mike Gabriel2017-04-051-1/+1
* Merge branch 'uli42-pr/cleanup_keystroke' into 3.6.xMike Gabriel2017-04-0310-203/+317
|\
| * Keystrokes: rename left/up/right/down keystrokes to descriptive namesUlrich Sibiller2017-04-035-64/+64
| * doc: rework keystroke documentationUlrich Sibiller2017-04-031-43/+50
| * doc: document debugging keystrokesUlrich Sibiller2017-04-032-6/+27
| * keystrokes.cfg: remove debug keystrokesUlrich Sibiller2017-04-031-4/+0
| * Keystroke.c: move some vars to inner scopeUlrich Sibiller2017-04-031-5/+2
| * Init keystrokes at startup and reconnectUlrich Sibiller2017-04-034-9/+12
| * Keystroke.c: avoid use of comparisons on "False"Ulrich Sibiller2017-04-031-21/+13
| * Keystroke.c: use Booleans where appropriateUlrich Sibiller2017-04-031-13/+13
| * Keystroke.h: improve parse_keystroke_file()Ulrich Sibiller2017-04-031-35/+44
| * Keystroke.c: introduce nxagentDumpKeystrokes()Ulrich Sibiller2017-04-032-0/+35
| * keystrokes.cfg: add missing keystrokesUlrich Sibiller2017-04-031-0/+12
| * Keystroke.c/h: completely disable keystrokes that are not active at compile timeUlrich Sibiller2017-04-032-10/+27
| * Keystroke.h: auto-enum keystrokesUlrich Sibiller2017-04-031-26/+25
| * Keystroke.h/Keyboard.h: cleanup mask variablesUlrich Sibiller2017-04-032-2/+3
| * Keystroke.c: detect duplicate keystroke definitionsUlrich Sibiller2017-04-031-0/+23
| * Keystroke.c: use KEYSTROKE_NOTHINGUlrich Sibiller2017-04-031-3/+3
| * Args.c: add two missing options to help messageUlrich Sibiller2017-04-031-0/+2
|/
* Merge branch 'sunweaver-pr/xinerama-response-swapping-in-RRXineramaWriteMonit...Mike Gabriel2017-04-031-0/+7
|\
| * xinerama: Swap the response in RRXineramaWriteMonitorMichal Srb2017-04-031-0/+7
|/
* Merge branch 'mikedep333-pr/cygwin-nxcomp-ftbfs' into 3.6.xMike Gabriel2017-04-032-24/+0
|\
| * Remove EMX (MS-DOS & OS/2) supportMike DePaulo2017-03-292-19/+0
| * Cygwin nxcomp: Use Cygwin un.hMike DePaulo2017-03-292-7/+2
|/
* regression fix for 52872a0: Keep index parameter in AddScreen() for now. Requ...Mike Gabriel2017-03-271-2/+3
* Merge branch 'uli42-pr/libX11-HEAD' into 3.6.xMike Gabriel2017-03-272-2/+14
|\
| * _XDefaultError: set XlibDisplayIOError flag before calling exitArthur Huillet2017-03-261-0/+10
| * Fix wrong Xfree in XListFonts failure pathJulien Cristau2017-03-261-2/+4
|/
* Merge branch 'sunweaver-pr/dix-dispatch-backports' into 3.6.xMihai Moldovan2017-03-262-227/+222
|\
| * dix: Remove insane BC hacksMike Gabriel2017-03-241-12/+1
| * Move AddScreen() comment where it actually belongs. Should be done in X.org, ...Mike Gabriel2017-03-241-0/+7
| * dix: Move AddScreen() over into dispatch.c and introduce init_screen()Mike Gabriel2017-03-242-215/+214
|/
* Merge branch 'sunweaver-pr/various-os-backports' into 3.6.xMihai Moldovan2017-03-2228-554/+1340
|\
| * os: Remove the useless -x optionAdam Jackson2017-03-212-13/+0
| * os: FatalError if -displayfd writes fail AND Clear the -displayfd option afte...Keith Packard2017-03-211-2/+6
| * Use unique logfile names when starting server with -displayfdAlan Coopersmith2017-03-213-29/+100
| * os: -displayfd should check ports up to 65535Jon TURNEY2017-03-211-1/+1
| * os: Use NotifyFd interface for listen descriptorsKeith Packard2017-03-213-74/+53
| * Handle -displayfd and an explicit display number sensiblyJon TURNEY2017-03-214-8/+9
| * Xserver/os/utils.c: Add NXAGENT_SERVER specific -nolisten parameter: ANY.Mike Gabriel2017-03-212-0/+6
| * os: Add a mechanism to prevent creating any listen socketsKristian Høgsberg2017-03-213-5/+9
| * os: Add -displayfd optionChase Douglas2017-03-215-26/+69
| * os: Use NotifyFd for ErrorConnMaxKeith Packard2017-03-212-18/+19
| * Move SIGUSR1 notification as late as possible.Adam Jackson2017-03-213-38/+53
| * dix: Extend initial connection handshake for forwarding proxiesAdam Jackson2017-03-212-8/+14
| * dix: Pull client-is-local flag up to the ClientRecAdam Jackson2017-03-216-14/+5
| * os: always check if client is local when connection is acceptedPauli Nieminen2017-03-213-3/+19
| * os: Add facilities for client ID tracking.Rami Ylimäki2017-03-218-0/+485