aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* Merge branch 'uli42-pr/drop_double_min_max' into 3.6.xMike Gabriel2018-08-245-20/+14
|\
| * Replace MIN/MAX macros by min/max from misc.hUlrich Sibiller2018-08-235-20/+14
|/
* Merge branch 'uli42-pr/fix_wm_props' into 3.6.xMike Gabriel2018-08-221-13/+20
|\
| * Fix broken 9a7c0b081fad98bfcfcceff9557781f4b39ec572Ulrich Sibiller2018-08-221-13/+20
|/
* Merge branch 'uli42-pr/fix_events_debug_warnings' into 3.6.xMike Gabriel2018-08-221-16/+10
|\
| * Events.c: drop variable that caused compilation warningUlrich Sibiller2018-08-221-8/+2
| * Events.c: fix wrong printf format specifiersUlrich Sibiller2018-08-221-4/+4
| * Events.c: fix compiler warningsUlrich Sibiller2018-08-221-3/+3
| * Events.c: mitigate compiler warningUlrich Sibiller2018-08-221-1/+1
|/
* Merge branch 'uli42-pr/refactor_defaulteventmask' into 3.6.xMike Gabriel2018-08-224-41/+19
|\
| * refactor nxagentGet(Default)EventMaskUlrich Sibiller2018-08-224-41/+19
|/
* Merge branch 'uli42-pr/track_versions' into 3.6.xMike Gabriel2018-08-221-0/+22
|\
| * add list with versions of the xserver modulesUlrich Sibiller2018-08-221-0/+22
|/
* Merge branch 'Etersoft-fix-nxagent-window-title-encoding' into 3.6.xMike Gabriel2018-08-221-9/+8
|\
| * nxagent: Used 'Xutf8SetVMPropertis' instead of 'XSetStandardProperties' + 'Xu...Pavel Vaynerman2018-08-221-13/+6
| * fix window title encoding (use utf8) for nxagentPavel Vaynerman2018-08-221-2/+8
|/
* Use min() [defined in include/misc.h] instead of MIN() [not defined in any Xo...Alan Coopersmith2018-08-211-3/+3
* [PATCH] os: XDMCP options like -query etc. should imply -listen tcpMihai Moldovan2018-07-181-0/+17
* misc: fix more regressions and whitespace weirdness introduced in 913fcf1a744...Mihai Moldovan2018-07-0710-18/+53
* nx-X11/lib/include/xtrans/Xtrans.c: Regression fix for 913fcf1a.Mike Gabriel2018-07-031-1/+0
* XKB.h: Use the correct value for XkbAllAccessXEventsMaskUlrich Sibiller2018-07-031-1/+1
* Merge branch 'mjtrangoni-WIP-add-cppcheck' into 3.6.xMike Gabriel2018-07-0314-44/+118
|\
| * travis.yml: refactor some config options, add gcc-8 and clang-6.0.Mario Trangoni2018-07-031-22/+53
| * Fix some memory leaks.Mario Trangoni2018-07-0312-30/+44
| * travis.yml: Add cppcheck - A tool for static C/C++ code analysis.Mario Trangoni2018-07-032-2/+31
|/
* Merge branch 'uli42-pr/fix_xfont2' into 3.6.xMike Gabriel2018-07-031-4/+5
|\
| * Makefile: pass down Xfont2 define for ImakeUlrich Sibiller2018-07-031-4/+5
|/
* Merge branch 'uli42-gh-sunweaver/pr/xserver-xkb-cleanup' into 3.6.xMike Gabriel2018-07-0327-2599/+207
|\
| * debian/nxagent.*: Drop conffile /etc/nxagent/nxagent.keyboard. Not shipped up...Mike Gabriel2018-07-034-1/+9
| * nx-libs.spec: Drop reference to obsolete nxagent.keyboard file.Mike Gabriel2018-07-031-1/+0
| * etc/nxagent.keyboard: Drop file. Not required anymore.Mike Gabriel2018-07-032-2/+0
| * Xserver/xkb: Remove XkbCF DDX configuration code.Mike Gabriel2018-07-032-1343/+2
| * Removal of dead code in Xserver/xkb. Follow-up commit for 3739a9b.Mike Gabriel2018-07-0317-1079/+189
| * Xserver/xkb: Remove -xkbmap argument.Daniel Stone2018-07-033-76/+0
| * hw/nxagent/Keyboard.c: Drop support for loading XKB config from file.Mike Gabriel2018-07-031-97/+7
|/
* Merge branch 'uli42-pr/more_debug' into 3.6.xMike Gabriel2018-07-031-0/+29
|\
| * Atoms.c: more debugging outputUlrich Sibiller2018-07-031-0/+29
|/
* Merge branch 'uli42-pr/misc' into 3.6.xMike Gabriel2018-07-036-72/+64
|\
| * dixfonts.c: use calloc for LFclosurePtrMike Gabriel2018-07-031-1/+1
| * dix/dixfonts.c: free() can handle NULLMike Gabriel2018-07-031-8/+6
| * NXdixfonts.c: free() can handle NULLUlrich Sibiller2018-07-031-13/+10
| * NXdixfonts.c: use calloc for LFclosurePtrUlrich Sibiller2018-07-031-1/+1
| * xkb/xkb.c: init all reply structsUlrich Sibiller2018-07-031-26/+19
| * os/io.c: fix unitialised bytesUlrich Sibiller2018-07-031-1/+6
| * ProcGetPointerMapping uses rep.nElts before it is initializedUlrich Sibiller2018-07-031-3/+6
| * Fix some valgrind findingsUlrich Sibiller2018-07-032-15/+11
| * Some small Keyboard.c improvementsUlrich Sibiller2018-07-031-4/+4
|/
* Merge branch 'sunweaver-pr/idletime-counter' into 3.6.xMike Gabriel2018-07-033-15/+163
|\
| * Don't reset the lastDeviceEventTime when doing DPMS actionsMike Gabriel2018-07-031-13/+4
| * Do not reset lastDeviceEventTime when we do dixSaveScreensRichard Hughes2018-07-031-2/+0