aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'sunweaver-pr/rpm-packaging-updates' into 3.6.xMike Gabriel2016-07-051-6/+51
|\
| * nx-libs.spec: Add Conflicts: fields for removed shared library bin:packages.Mike Gabriel2016-07-051-0/+20
| * nx-libs.spec: Let libNX_X11-6 and libNX_X11-devel conflict with deprecated li...Mike Gabriel2016-07-051-0/+4
| * nx-libs.spec: Let nxagent conflict with nxauth, which is not provided anymore.Mike Gabriel2016-07-051-0/+2
| * nx-libs.spec: Add correct Obsoletes:/Provides: fields for lib* bin:packages.Mike Gabriel2016-07-051-4/+16
| * nx-libs.spec: Fix various issues since last testing the RPM builds of nx-libs:Mike Gabriel2016-07-051-2/+9
|/
* debian/control: Add some hard and exact-versioned dependencies for our bin:pa...Mike Gabriel2016-07-051-0/+8
* Merge branch 'sunweaver-pr/writeeventstoclients-no-sequencenumber' into 3.6.xMike Gabriel2016-07-0516-68/+24
|\
| * Set event sequence number in WriteEventsToClient instead of at callers.Jamey Sharp2016-07-0514-41/+7
| * Make WriteEventsToClient/WriteToClient no-op on fake or dead clients.Jamey Sharp2016-07-059-30/+20
|/
* Merge branch 'sunweaver-pr/silencing-compiler-warnings' into 3.6.xMike Gabriel2016-07-0551-2553/+148
|\
| * Replace INITARGS with voidTomas Carnecky2016-07-0517-67/+63
| * nx-X11/lib/X11/XKBMisc.c: Avoid warning about maybe non-assigned variables (m...Mike Gabriel2016-07-051-5/+5
| * Remove INITARGS braindamage, change to void; add XkbExtensionInit prototype t...Daniel Stone2016-07-052-2/+4
| * Xserver/Xext/xres.c: Drop unused REQUEST macro call (for xXResQueryVersionReq).Keith Packard2016-07-051-1/+0
| * Xserver: Post-REGION-macros-to-inline-funcs clean-up.Mike Gabriel2016-07-056-23/+0
| * Xserver/mi/mizerarc.c: Initialize oddPtrs as NULL before using it (in miZeroP...Mike Gabriel2016-07-051-1/+1
| * Xserver/mi/miarc.c: Initialize dashRemaining with 0 before using it.Mike Gabriel2016-07-051-1/+1
| * Xserver/os/xdmauth.c: Avoid compiler warnings due to -Wswitch being enabled. ...Mike Gabriel2016-07-051-6/+2
| * Xserver/os/log.c: Make sure strlcpy is defined in log.c. Immitate what is don...Mike Gabriel2016-07-052-0/+8
| * Restore compression of duplicate log file entries.Adam Jackson2016-07-051-10/+0
| * os: Make sure that writing our pid to the lock file actually workedKeith Packard2016-07-051-1/+3
| * Xserver/os/connection.c: Drop unused variable 'restore_trans_conn' from Clien...Mike Gabriel2016-07-051-1/+0
| * Xserver/os/connection.c: Only define XSERV_t, TRANS_SERVER and TRANS_REOPEN i...Mike Gabriel2016-07-051-3/+9
| * nx-X11/lib/X11/imTrX.c: Fix warning ‘len’ may be used uninitialized in th...Mike Gabriel2016-07-051-1/+1
| * nx-X11/lib/X11/imInsClbk.c: Fix warning 'right-hand operand of comma expressi...Mike Gabriel2016-07-051-1/+1
| * nx-X11/lib/X11/lcFile.c: Drop conditional always evaluating as True.Mike Gabriel2016-07-051-2/+1
| * nx-X11/lib/X11/XKBMisc.c: Drop conditional always evaluating as True.Mike Gabriel2016-07-051-1/+1
| * nx-X11/lib/X11/LiHosts.c: Drop unused variable (in XListHosts).Mike Gabriel2016-07-051-4/+0
| * Avoid 'siAddr' maybe being used uninitialized in XAddHost and XRemoveHost.Mike Gabriel2016-07-051-47/+26
| * hw/nxagent/Exrensions.c: Post-RandR 1.5 update fix. Properly set rrProvider h...Mike Gabriel2016-07-051-3/+3
| * hw/nxagent/Args.c: Fix fprintf placeholder (%u -> %lu).Mike Gabriel2016-07-051-2/+2
| * Remove fbpseudocolorAdam Jackson2016-07-053-2357/+0
| * fb: Mark some variables as unused.Cyril Brulebois2016-07-056-9/+9
| * Add _X_UNUSED attribute to designate unused variables and silence warningsJeremy Huddleston2016-07-051-0/+7
| * Xserver/composite/compint.h: Disable debugging in Copmosite extension.Mike Gabriel2016-07-051-3/+1
| * Xserver/xfixes/region.c: Don't declare and set PictureScreenPtr ps (in ProcXF...Mike Gabriel2016-07-051-2/+0
|/
* Merge branch 'sunweaver-pr/proxy-to-proxy-over-unix-socket' into 3.6.xMike Gabriel2016-07-055-489/+922
|\
| * test scripts: Add test scripts for testing Unix file socket support (i.e. pro...Mike Gabriel2016-07-042-0/+296
| * nxcomp/Loop.cpp: Add Unix file socket support for proxy <-> proxy connection.Mike Gabriel2016-07-043-222/+607
| * merge code paths depending on acceptHost being ""Salvador Fandino2016-07-041-11/+5
| * remove now unused function ParseListenOptionSalvador Fandino2016-07-041-20/+0
| * rewrite WaitForRemote to build on top of ListenConnectionTCPSalvador Fandino2016-07-041-61/+2
| * remove unused listenHost parameterSalvador Fandino2016-07-041-19/+3
| * Remove work around for OS/X that was doing nothingSalvador Fandino2016-07-041-24/+0
| * Simplify ParseListenOptionSalvador Fandino2016-07-041-12/+4
| * rewrite SetupUnixSocket to use ListenConnectionUnixSalvador Fandino2016-07-041-70/+20
| * Rework SetupTcpSocket to use ListenConnectionTCPSalvador Fandino2016-07-041-66/+1
|/
* Merge branch 'sunweaver-pr/xerrordb-from-xorg' into 3.6.xMike Gabriel2016-07-047-7/+154
|\
| * libNX_X11 data files: Install libNX_X11 related data files.Mike Gabriel2016-07-047-7/+154
|/