aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * Keystroke.c: fix formattingUlrich Sibiller2017-03-131-1/+1
| * Keystroke.c: use an own environment variable for X2GoUlrich Sibiller2017-03-132-4/+11
| * Keystroke.c: make nxagentKeystrokeFileParsed localUlrich Sibiller2017-03-131-4/+5
| * Keystroke.c: add missing Mod5 modifierUlrich Sibiller2017-03-132-1/+2
| * Keystroke.c: fix code orderUlrich Sibiller2017-03-131-1/+3
| * Keystroke.h: sane struct initUlrich Sibiller2017-03-131-0/+1
| * Keyboard.c: Introduce separate masks for Alt and MetaUlrich Sibiller2017-03-131-0/+8
| * Keystroke.c: Fix modifier handlingUlrich Sibiller2017-03-131-1/+2
| * Keystroke.c: more/fixed debug outputUlrich Sibiller2017-03-131-2/+17
| * Keystroke: whitespace fixesUlrich Sibiller2017-03-132-2/+2
| * Keystroke.c: arrange switch_all_screens and fullscreen close togetherUlrich Sibiller2017-03-133-18/+18
| * Keystroke.c: print keystroke name in TEST modeUlrich Sibiller2017-03-131-2/+6
| * Keystroke.c: improve TEST outputUlrich Sibiller2017-03-131-3/+3
| * Keystroke.c: add another FIXMEUlrich Sibiller2017-03-131-0/+2
| * Keystroke.c: Simplify read_binding_from_xmlnodeUlrich Sibiller2017-03-131-16/+17
| * Keystroke.c: use symbols instead of integersUlrich Sibiller2017-03-131-2/+4
| * Keystroke.c: Boolify read_binding_from_xmlnodeUlrich Sibiller2017-03-132-45/+45
| * Keystroke.c: Boolify nxagentCheckSpecialKeystrokeUlrich Sibiller2017-03-132-8/+8
| * Keystroke.c: reorder parse_keystroke_fileUlrich Sibiller2017-03-131-7/+5
| * Keystroke.c: handle parsing state in parse_keystroke_file()Ulrich Sibiller2017-03-131-5/+6
| * Keystroke.c: simplify nxagentCheckSpecialKeystrokeUlrich Sibiller2017-03-131-19/+3
| * Keystroke.c: fix code formattingUlrich Sibiller2017-03-131-5/+4
| * Keystroke.c: rework read_binding_from_xmlnode()Ulrich Sibiller2017-03-111-54/+30
| * Keystroke.c: use Bool type where appropriateUlrich Sibiller2017-03-111-4/+4
|/
* Merge branch 'uli42-pr/misc_cherries' into 3.6.xMihai Moldovan2017-03-1011-65/+65
|\
| * Xext: fix compiler warningUlrich Sibiller2017-03-101-1/+1
| * xfixes: fix compiler warningUlrich Sibiller2017-03-101-2/+3
| * xfixes: fix compiler warningsUlrich Sibiller2017-03-101-2/+2
| * render/filter.c: add missing return valueUlrich Sibiller2017-03-101-1/+1
| * record.c: fix compiler warningsUlrich Sibiller2017-03-101-3/+3
| * fb: fix compiler warningUlrich Sibiller2017-03-101-2/+0
| * dix: Fix compiler warningUlrich Sibiller2017-03-101-1/+2
| * Display.c: remove unused logo codeUlrich Sibiller2017-03-101-37/+0
| * Rootless.c: improve debugging outputUlrich Sibiller2017-03-101-4/+4
| * Rootless.c: improve malloc failure handlingUlrich Sibiller2017-03-101-2/+34
| * Rootless.c: fix possible memleakUlrich Sibiller2017-03-101-0/+1
| * Display.c: pid is always 0, remove checkUlrich Sibiller2017-03-101-1/+1
| * Window.c: Fix reference before check for null pointerUlrich Sibiller2017-03-101-3/+7
| * Keyboard.c: Simplify if clauseUlrich Sibiller2017-03-101-4/+2
| * Rootless.c: Fix wrongly negated comparisonsUlrich Sibiller2017-03-101-2/+2
| * Args.c: Fix missing parenthesesUlrich Sibiller2017-03-101-0/+2
|/
* nxcomp/ChannelEndPoint.cpp: we're not really testing for a character, but a p...Mihai Moldovan2017-03-091-1/+1
* Merge branch 'uli42-pr/backup_null_rulesfile' into 3.6.xMihai Moldovan2017-03-071-5/+25
|\
| * xkb: Allow NULL as rulesFile in XkbSetRulesDflts.Peter Hutterer2017-03-071-5/+25
|/
* Merge branch 'uli42-pr/cve-2017-2624' into 3.6.xMihai Moldovan2017-03-075-3/+63
|\
| * os: add timingsafe_memcmp to ImakeUlrich Sibiller2017-03-042-2/+10
| * Backport CVE-2017-2624 (timingsafe_memcmp)Ulrich Sibiller2017-03-034-3/+55
|/
* Merge branch 'uli42-pr/fix_validatestring' into 3.6.xMike Gabriel2017-03-0318-90/+73
|\
| * replace (DE)ALLOCATE_LOCAL by malloc/freeUlrich Sibiller2017-03-0348-347/+340
| * nxagent: move validateString as inline func to Utils.hUlrich Sibiller2017-03-037-9/+8