aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* Merge branch 'uli42-pr/simplify_xtrans' into 3.6.xMike Gabriel2017-12-111-44/+0
|\
| * Xtranssock.c: simplify code in SocketWritevUlrich Sibiller2017-12-111-44/+0
|/
* Merge branch 'sunweaver-pr/drop-NoMachines-own-Xvasprintf-implementation' int...Mike Gabriel2017-12-111-50/+1
|\
| * Xserver/os/xprintf.c: Drop NoMachine's own implementation of Xvasprintf(). Us...Mike Gabriel2017-12-111-50/+1
|/
* nx-X11/programs/Xserver/os/xprintf.c: remove doubly-defined Xscnprintf functi...Mihai Moldovan2017-12-111-22/+2
* Merge branch 'Ionic-feature/backport-asprintf' into 3.6.xMike Gabriel2017-12-104-50/+330
|\
| * os/xprintf: add Xvscnprintf and XscnprintfDaniel Kurtz2017-12-102-0/+56
| * Typo in xserver Xvasprintf()Colin Harrison2017-12-101-2/+2
| * Add asprintf() implementation for platforms without itAlan Coopersmith2017-12-104-48/+272
|/
* Merge branch 'uli42-pr/fix_memleaks' into 3.6.xMihai Moldovan2017-12-095-26/+57
|\
| * nxcomp: use new macro SAFE_FREE(ptr)Ulrich Sibiller2017-12-094-39/+33
| * Loop.cpp: fix more memory leaksUlrich Sibiller2017-12-091-1/+15
| * Loop.cpp: fix two memleaksUlrich Sibiller2017-12-091-4/+19
| * ChannelEndPoint.cpp: fix two memleaksUlrich Sibiller2017-12-091-4/+10
| * nxcomp: simplify free callsUlrich Sibiller2017-12-091-3/+3
| * nxcomp: fix double freeUlrich Sibiller2017-12-091-0/+2
|/
* Merge branch 'uli42-pr/keep_co' into 3.6.xMihai Moldovan2017-12-092-0/+17
|\
| * Reintroduce -co as no-opUlrich Sibiller2017-12-072-0/+17
|/
* 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-06 17:24:33 +0000