aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * Keystroke.c: fix code formattingUlrich Sibiller2017-03-131-5/+4
| * Keystroke.c: rework read_binding_from_xmlnode()Ulrich Sibiller2017-03-111-54/+30
| * Keystroke.c: use Bool type where appropriateUlrich Sibiller2017-03-111-4/+4
|/
* Merge branch 'uli42-pr/misc_cherries' into 3.6.xMihai Moldovan2017-03-1011-65/+65
|\
| * Xext: fix compiler warningUlrich Sibiller2017-03-101-1/+1
| * xfixes: fix compiler warningUlrich Sibiller2017-03-101-2/+3
| * xfixes: fix compiler warningsUlrich Sibiller2017-03-101-2/+2
| * render/filter.c: add missing return valueUlrich Sibiller2017-03-101-1/+1
| * record.c: fix compiler warningsUlrich Sibiller2017-03-101-3/+3
| * fb: fix compiler warningUlrich Sibiller2017-03-101-2/+0
| * dix: Fix compiler warningUlrich Sibiller2017-03-101-1/+2
| * Display.c: remove unused logo codeUlrich Sibiller2017-03-101-37/+0
| * Rootless.c: improve debugging outputUlrich Sibiller2017-03-101-4/+4
| * Rootless.c: improve malloc failure handlingUlrich Sibiller2017-03-101-2/+34
| * Rootless.c: fix possible memleakUlrich Sibiller2017-03-101-0/+1
| * Display.c: pid is always 0, remove checkUlrich Sibiller2017-03-101-1/+1
| * Window.c: Fix reference before check for null pointerUlrich Sibiller2017-03-101-3/+7
| * Keyboard.c: Simplify if clauseUlrich Sibiller2017-03-101-4/+2
| * Rootless.c: Fix wrongly negated comparisonsUlrich Sibiller2017-03-101-2/+2
| * Args.c: Fix missing parenthesesUlrich Sibiller2017-03-101-0/+2
|/
* nxcomp/ChannelEndPoint.cpp: we're not really testing for a character, but a p...Mihai Moldovan2017-03-091-1/+1
* Merge branch 'uli42-pr/backup_null_rulesfile' into 3.6.xMihai Moldovan2017-03-071-5/+25
|\
| * xkb: Allow NULL as rulesFile in XkbSetRulesDflts.Peter Hutterer2017-03-071-5/+25
|/
* Merge branch 'uli42-pr/cve-2017-2624' into 3.6.xMihai Moldovan2017-03-075-3/+63
|\
| * os: add timingsafe_memcmp to ImakeUlrich Sibiller2017-03-042-2/+10
| * Backport CVE-2017-2624 (timingsafe_memcmp)Ulrich Sibiller2017-03-034-3/+55
|/
* Merge branch 'uli42-pr/fix_validatestring' into 3.6.xMike Gabriel2017-03-0318-90/+73
|\
| * replace (DE)ALLOCATE_LOCAL by malloc/freeUlrich Sibiller2017-03-0348-347/+340
| * nxagent: move validateString as inline func to Utils.hUlrich Sibiller2017-03-037-9/+8
| * xkb: add missing constUlrich Sibiller2017-03-031-1/+2
| * xkb: remove XkbAtomGetString, replace with NameForAtom.Peter Hutterer2017-03-035-15/+8
| * Replace _XkbDupString with XstrdupAlan Coopersmith2017-03-039-72/+55
| * nxagent: half number of NameForAtom callsUlrich Sibiller2017-03-036-2/+9
* | Merge branch 'uli42-pr/remove_allocate_local' into 3.6.xMike Gabriel2017-03-0348-347/+340
|\ \ | |/ |/|
| * replace (DE)ALLOCATE_LOCAL by malloc/freeUlrich Sibiller2017-03-0348-347/+340
|/
* Merge branch 'sunweaver-pr/really-enable-MITSHM-in-fboverlay-c' into 3.6.xMihai Moldovan2017-03-034-2/+54
|\
| * Xserver/mi/miscrinit.c: Use new shmint.h for making ShmRegisterFbFuncs() avai...Mike Gabriel2017-03-031-2/+1
| * Xserver/fb/fboverlay.c: Define -DMITSHM at build as it is used in fboverlay.c.Mike Gabriel2017-03-032-0/+9
| * Xserver/Xext/shmint.h: Provide header file exporting ShmRegisterFunc and ShmR...Mike Gabriel2017-03-031-0/+44
|/
* Merge branch 'sunweaver-pr/fix-unused-libNX_X11-files' into 3.6.xMihai Moldovan2017-03-0311-2368/+14
|\
| * libNX_X11: Fully drop loadable i18n module support in libNX_X11.Mike Gabriel2017-03-036-2340/+3
| * libNX_X11/lcUTF8.c: Drop not-used X11/lcUniConv/ascii.h.Mike Gabriel2017-03-032-28/+0
| * doc/libNX_X11/lcUniConv: Move over the rather-documentary files 8bit_tab_to_h...Mike Gabriel2017-03-032-0/+0
| * doc/libNX_X11/lcUniConv: Pull over README from X.org's libX11 to document the...Mike Gabriel2017-03-031-0/+11
|/
* Merge branch 'sunweaver-pr/happyvalgrind-in-glXQueryVersion' into 3.6.xMike Gabriel2017-03-031-0/+2
|\
| * Xserver/GL/glx/glxcmd.c: Fix uninitialized xGLXQueryVersionReply.Mike Gabriel2017-03-031-0/+2
|/
* misc nx-X11/programs/Xserver/randr/: switch to using xreallocarray, since it ...Mihai Moldovan2017-03-036-60/+0
* misc nx-X11/programs/Xserver/{composite,dix,randr}/: switch to using realloca...Mihai Moldovan2017-03-037-62/+0
* nx-X11/programs/Xserver/include/os.h: backport xallocarray().Mihai Moldovan2017-03-031-0/+2
* nx-X11/{config/cf/{{Imake,X11}.tmpl,linux.cf},programs/Xserver/{include/os.h,...Mihai Moldovan2017-03-036-3/+70