aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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
* misc nx-X11/programs/Xserver/{hw/nxagent,miext,render}/: move code around so ...Mihai Moldovan2017-03-0312-557/+402
* nx-X11/programs/Xserver/mi/{Imakefile,mibank.{c,h}}: backport ffaae7c0c69a51a...Mihai Moldovan2017-03-033-2697/+0
* Merge branch 'sunweaver-pr/happyvalgrind-nxagentResetSignalHandlers' into 3.6.xMike Gabriel2017-03-031-0/+2
|\
| * hw/nxagent/Display.c: Fix uninitialized newAction in nxagentResetSignalHandle...Mike Gabriel2017-03-031-0/+2
|/
* Merge branch 'uli42-pr/happyvalgrind' into 3.6.xMike Gabriel2017-03-0317-47/+93
|\
| * Fix "uninitialised byte(s)" complaints from valgrindUlrich Sibiller2017-03-0217-47/+93
|/
* Merge branch 'sunweaver-pr/allow-empty-nx-options-string' into 3.6.xMihai Moldovan2017-03-021-2/+3
|\
| * nxcomp/Loop.cpp: Allow nx/nx:<disp> as DISPLAY variable (i.e. an empty nx/nx ...Mike Gabriel2017-03-021-1/+2
| * nxcomp/Loop.cpp: Ignore, options= nx/nx parameter, if file options path start...Mike Gabriel2017-03-021-1/+1
|/
* Merge branch 'sunweaver-pr/constify-atom-name-strings' into 3.6.xMihai Moldovan2017-03-0210-26/+25
|\
| * Xserver/dix/atom.c (et al.): Constify atom name strings.Mike Gabriel2017-03-0210-26/+25
|/
* Merge branch 'sunweaver-pr/randr-regression-fix-re-adding-RegisterResourceNam...Mihai Moldovan2017-03-015-0/+25
|\
| * nx-libs.spec: Add BR filesystem for SUSE builds (as it provides /usr/share/fo...Mike Gabriel2017-03-011-0/+4
| * nx-libs.spec: Add BR for Fedora/RHEL builds: xorg-x11-font-utils.Mike Gabriel2017-03-011-0/+1
| * nx-libs.spec: Versioned BR on libXfont-devel (and alike) (>= 1.4.2).Mike Gabriel2017-03-011-3/+3
| * debian/control: Versioned B-D on libXfont (>= 1.4.2).Mike Gabriel2017-03-011-1/+1
| * dix: use one single function to register fpe fontsTiago Vignatti2017-03-012-8/+1
| * nx-libs.spec: Handle fonts dir symlinking and install /usr/share/nx/fonts sym...Mike Gabriel2017-03-011-2/+11
| * For consistency, apply patch from previous commit (630a7c3) to the original X...Mike Gabriel2017-03-011-3/+31
| * {dix/,hw/nxagent/NX}dixfont.{c,h}: Support using builtin-fonts. Makes depende...Mike Gabriel2017-03-013-11/+45
| * Xserver/dix/main.c: ErrorF requires a string to end with an EOL char.Mike Gabriel2017-03-011-1/+1
| * debian/nx-x11-common.{links,dirs}: Make sure /usr/share/fonts/X11 are reachab...Mike Gabriel2017-03-012-0/+3