aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'uli42-p/xquerytree_leak' into 3.6.xMihai Moldovan2017-12-073-27/+28
|\
| * Events.c: add ifdef around nxagentRemoteWindowsTreeUlrich Sibiller2017-12-071-0/+3
| * Make sure XQueryTree results are freedUlrich Sibiller2017-12-073-22/+24
| * Events.c: drop unused variableUlrich Sibiller2017-12-071-3/+0
| * Events.c: move variable to inner scopeUlrich Sibiller2017-12-071-2/+1
|/
* Merge branch 'uli42-pr/various_backports' into 3.6.xMihai Moldovan2017-12-0710-23/+15
|\
| * DIX: XKB: Set xkbInfo to NULL as well as freeing itDaniel Stone2017-12-071-0/+1
| * Allow options to appear with other components.Daniel Stone2017-12-071-7/+0
| * devPrivates fixesLars Knoll2017-12-072-1/+3
| * Coverity # 337: Remove useless NULL check.Adam Jackson2017-12-071-1/+1
| * Coverity # 491: Check version number correctly.Adam Jackson2017-12-071-1/+1
| * Coverity # 487: Check version number correctly.Adam Jackson2017-12-071-1/+1
| * Coverity # 807: Fix a memory leak in XFixesExpandRegion.Adam Jackson2017-12-071-0/+1
| * randr: free crtc->outputs on destroyGiuseppe Bilotta2017-12-071-0/+1
| * randr: always realloc crtcs and outputsGiuseppe Bilotta2017-12-072-12/+6
|/
* Merge branch 'uli42-pr/improve_nxproxy_help' into 3.6.xMihai Moldovan2017-12-072-6/+51
|\
| * nxproxy/nxcomp: document logging optionsUlrich Sibiller2017-12-072-0/+42
| * nxcomp/nxproxy: slightly improve the usage message of nxproxyUlrich Sibiller2017-12-071-6/+8
| * nxcomp/nxproxy: add missing hint for keyconv optionUlrich Sibiller2017-12-071-0/+1
|/
* Merge branch 'sunweaver-pr/drop-bin-wrappers' into 3.6.xMihai Moldovan2017-12-068-95/+25
|\
| * Makefile: Quote '$@' in make calls with double quotes.Mike Gabriel2017-12-051-9/+9
| * Makefile: Don't use DESTDIR in configure.Mike Gabriel2017-12-051-1/+1
| * Drop bin wrappers for nxagent and nxproxy, directly install nxproxy and nxage...Mike Gabriel2017-12-058-88/+18
|/
* Merge branch 'uli42-pr/fix_global_tcpFD' into 3.6.xMike Gabriel2017-12-059-90/+84
|\
| * nxcomp: use lowercase abbreviations for seconds and millisecondsUlrich Sibiller2017-12-029-71/+71
| * nxcomp: remove unused return valuesUlrich Sibiller2017-12-021-19/+12
| * nxcomp: Fix setting of global tcpFDUlrich Sibiller2017-12-021-1/+2
|/
* Merge branch 'uli42-pr/nokeyconv' into 3.6.xMihai Moldovan2017-11-265-5/+72
|\
| * Keyboard.c: make nxagentKeycodeConversion a BooleanUlrich Sibiller2017-11-231-1/+1
| * add option keyconv=(auto|on|off)Ulrich Sibiller2017-11-235-0/+67
| * Keyboard.c: Use booleans for nxagentKeycodeConversionUlrich Sibiller2017-11-231-5/+5
|/
* nxcomp/src/Misc.cpp: Update explanation for the NX_TEMP env variable.Mike Gabriel2017-11-221-2/+1
* nxproxy.1 man page: Update explanation for NX_TEMP env variable.Mike Gabriel2017-11-221-2/+1
* Merge branch 'Ionic-bugfix/hardcode-socket-paths-in-libX11' into 3.6.xMike Gabriel2017-11-221-168/+0
|\
| * nx-X11/lib/include/xtrans/Xtranssock.c: drop UNIX path overrides as well.Mihai Moldovan2017-11-221-168/+0
|/
* Merge branch 'uli42-pr/simplify_free' into 3.6.xMike Gabriel2017-11-2113-185/+58
|\
| * Error.c: simply nxagentGetClientsPath()Ulrich Sibiller2017-11-211-31/+8
| * simply free() callsUlrich Sibiller2017-11-2112-154/+50
|/
* Merge branch 'uli42-pr/options_on_reconnect' into 3.6.xMike Gabriel2017-11-203-57/+60
|\
| * Args.c: simplify nxagentProcessOptionsFile()Ulrich Sibiller2017-11-181-20/+16
| * Args.c: Fix compile bug with DEBUG enabledUlrich Sibiller2017-11-181-1/+1
| * Fix options parsing on reconnectUlrich Sibiller2017-11-183-36/+43
|/
* Merge branch 'uli42-small_fixes' into 3.6.xMike Gabriel2017-11-174-135/+23
|\
| * fix broken path due to missing /Ulrich Sibiller2017-11-171-10/+10
| * NXglxext.c: rename and relocate variableUlrich Sibiller2017-11-171-4/+3
| * glxext.c/NXglxext.c: merge two functions into oneUlrich Sibiller2017-11-172-120/+9
| * keysym.h: fix include pathUlrich Sibiller2017-11-171-1/+1
|/
* Merge branch 'uli42-pr/fix_manpage' into 3.6.xMike Gabriel2017-11-171-55/+73
|\
| * nxagent manpage: some minor formatting improvements and typo fixesUlrich Sibiller2017-11-171-55/+73
|/
* Merge branch 'Ionic-bugfix/hardcode-some-socket-paths' into 3.6.xMike Gabriel2017-11-041-15/+7
|\
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 04:36:18 +0000