| Commit message (Expand) | Author | Age | Files | Lines |
* | Events.c: move variable to inner scope | Ulrich Sibiller | 2017-12-07 | 1 | -2/+1 |
* | Merge branch 'uli42-pr/various_backports' into 3.6.x | Mihai Moldovan | 2017-12-07 | 10 | -23/+15 |
|\ |
|
| * | DIX: XKB: Set xkbInfo to NULL as well as freeing it | Daniel Stone | 2017-12-07 | 1 | -0/+1 |
| * | Allow options to appear with other components. | Daniel Stone | 2017-12-07 | 1 | -7/+0 |
| * | devPrivates fixes | Lars Knoll | 2017-12-07 | 2 | -1/+3 |
| * | Coverity # 337: Remove useless NULL check. | Adam Jackson | 2017-12-07 | 1 | -1/+1 |
| * | Coverity # 491: Check version number correctly. | Adam Jackson | 2017-12-07 | 1 | -1/+1 |
| * | Coverity # 487: Check version number correctly. | Adam Jackson | 2017-12-07 | 1 | -1/+1 |
| * | Coverity # 807: Fix a memory leak in XFixesExpandRegion. | Adam Jackson | 2017-12-07 | 1 | -0/+1 |
| * | randr: free crtc->outputs on destroy | Giuseppe Bilotta | 2017-12-07 | 1 | -0/+1 |
| * | randr: always realloc crtcs and outputs | Giuseppe Bilotta | 2017-12-07 | 2 | -12/+6 |
|/ |
|
* | Merge branch 'uli42-pr/improve_nxproxy_help' into 3.6.x | Mihai Moldovan | 2017-12-07 | 2 | -6/+51 |
|\ |
|
| * | nxproxy/nxcomp: document logging options | Ulrich Sibiller | 2017-12-07 | 2 | -0/+42 |
| * | nxcomp/nxproxy: slightly improve the usage message of nxproxy | Ulrich Sibiller | 2017-12-07 | 1 | -6/+8 |
| * | nxcomp/nxproxy: add missing hint for keyconv option | Ulrich Sibiller | 2017-12-07 | 1 | -0/+1 |
|/ |
|
* | Merge branch 'sunweaver-pr/drop-bin-wrappers' into 3.6.x | Mihai Moldovan | 2017-12-06 | 8 | -95/+25 |
|\ |
|
| * | Makefile: Quote '$@' in make calls with double quotes. | Mike Gabriel | 2017-12-05 | 1 | -9/+9 |
| * | Makefile: Don't use DESTDIR in configure. | Mike Gabriel | 2017-12-05 | 1 | -1/+1 |
| * | Drop bin wrappers for nxagent and nxproxy, directly install nxproxy and nxage... | Mike Gabriel | 2017-12-05 | 8 | -88/+18 |
|/ |
|
* | Merge branch 'uli42-pr/fix_global_tcpFD' into 3.6.x | Mike Gabriel | 2017-12-05 | 9 | -90/+84 |
|\ |
|
| * | nxcomp: use lowercase abbreviations for seconds and milliseconds | Ulrich Sibiller | 2017-12-02 | 9 | -71/+71 |
| * | nxcomp: remove unused return values | Ulrich Sibiller | 2017-12-02 | 1 | -19/+12 |
| * | nxcomp: Fix setting of global tcpFD | Ulrich Sibiller | 2017-12-02 | 1 | -1/+2 |
|/ |
|
* | Merge branch 'uli42-pr/nokeyconv' into 3.6.x | Mihai Moldovan | 2017-11-26 | 5 | -5/+72 |
|\ |
|
| * | Keyboard.c: make nxagentKeycodeConversion a Boolean | Ulrich Sibiller | 2017-11-23 | 1 | -1/+1 |
| * | add option keyconv=(auto|on|off) | Ulrich Sibiller | 2017-11-23 | 5 | -0/+67 |
| * | Keyboard.c: Use booleans for nxagentKeycodeConversion | Ulrich Sibiller | 2017-11-23 | 1 | -5/+5 |
|/ |
|
* | nxcomp/src/Misc.cpp: Update explanation for the NX_TEMP env variable. | Mike Gabriel | 2017-11-22 | 1 | -2/+1 |
* | nxproxy.1 man page: Update explanation for NX_TEMP env variable. | Mike Gabriel | 2017-11-22 | 1 | -2/+1 |
* | Merge branch 'Ionic-bugfix/hardcode-socket-paths-in-libX11' into 3.6.x | Mike Gabriel | 2017-11-22 | 1 | -168/+0 |
|\ |
|
| * | nx-X11/lib/include/xtrans/Xtranssock.c: drop UNIX path overrides as well. | Mihai Moldovan | 2017-11-22 | 1 | -168/+0 |
|/ |
|
* | Merge branch 'uli42-pr/simplify_free' into 3.6.x | Mike Gabriel | 2017-11-21 | 13 | -185/+58 |
|\ |
|
| * | Error.c: simply nxagentGetClientsPath() | Ulrich Sibiller | 2017-11-21 | 1 | -31/+8 |
| * | simply free() calls | Ulrich Sibiller | 2017-11-21 | 12 | -154/+50 |
|/ |
|
* | Merge branch 'uli42-pr/options_on_reconnect' into 3.6.x | Mike Gabriel | 2017-11-20 | 3 | -57/+60 |
|\ |
|
| * | Args.c: simplify nxagentProcessOptionsFile() | Ulrich Sibiller | 2017-11-18 | 1 | -20/+16 |
| * | Args.c: Fix compile bug with DEBUG enabled | Ulrich Sibiller | 2017-11-18 | 1 | -1/+1 |
| * | Fix options parsing on reconnect | Ulrich Sibiller | 2017-11-18 | 3 | -36/+43 |
|/ |
|
* | Merge branch 'uli42-small_fixes' into 3.6.x | Mike Gabriel | 2017-11-17 | 4 | -135/+23 |
|\ |
|
| * | fix broken path due to missing / | Ulrich Sibiller | 2017-11-17 | 1 | -10/+10 |
| * | NXglxext.c: rename and relocate variable | Ulrich Sibiller | 2017-11-17 | 1 | -4/+3 |
| * | glxext.c/NXglxext.c: merge two functions into one | Ulrich Sibiller | 2017-11-17 | 2 | -120/+9 |
| * | keysym.h: fix include path | Ulrich Sibiller | 2017-11-17 | 1 | -1/+1 |
|/ |
|
* | Merge branch 'uli42-pr/fix_manpage' into 3.6.x | Mike Gabriel | 2017-11-17 | 1 | -55/+73 |
|\ |
|
| * | nxagent manpage: some minor formatting improvements and typo fixes | Ulrich Sibiller | 2017-11-17 | 1 | -55/+73 |
|/ |
|
* | Merge branch 'Ionic-bugfix/hardcode-some-socket-paths' into 3.6.x | Mike Gabriel | 2017-11-04 | 1 | -15/+7 |
|\ |
|
| * | nxcomp/src/Loop.cpp: hardcode X11 and (legacy/xfs) font UNIX paths. | Mihai Moldovan | 2017-11-04 | 1 | -15/+7 |
|/ |
|
* | Merge branch 'Ionic-bugfix/fix-X-cookie-on-osx' into 3.6.x | Mike Gabriel | 2017-11-03 | 1 | -3/+23 |
|\ |
|
| * | nxcomp/src/Auth.cpp: handle launchd sockets in DISPLAY variable correctly whe... | Mihai Moldovan | 2017-11-03 | 1 | -3/+23 |
|/ |
|
* | nxproxy: use ax_pthread.m4. | Mihai Moldovan | 2017-10-27 | 3 | -0/+18 |