aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | Merge branch 'sunweaver-pr/drop-x2goagent' into 3.6.xMike Gabriel2016-06-2921-245/+46
|\|
| * Makefile,debian/*,nx-libs.spec,<misc>: Drop references to X2Go Project, esp. ...Mike Gabriel2016-06-2921-245/+46
|/
* Merge branch 'sunweaver-pr/libnx-xext-drop-unused-extensions' into 3.6.xMike Gabriel2016-06-2913-2965/+141
|\
| * libNX_Xext: Drop unused extensions: DPMS, XTestExt1, XSync, XSecurity.Mike Gabriel2016-06-2810-2949/+99
| * nx-X11/lib/Xext/Imakefile: Serialize parameters and make Imakefile changes mo...Mike Gabriel2016-06-281-10/+22
| * fix wrong bin:package for Xext proto headers: Move dpmsstr.h and securstr.h f...Mike Gabriel2016-06-284-4/+5
| * Fix linking order hack in nxagent.Mike Gabriel2016-06-281-10/+23
|/
* test scripts: Add run-nxagent test script.Mike Gabriel2016-06-271-0/+140
* Merge branch 'sunweaver-pr/hw-nxagent-drop-duplicate-Xserver-code_disable-Xse...Mihai Moldovan2016-06-2562-26144/+1064
|\
| * hw/nxagent: Drop code referring to the following removed Xserver extensions: ...Mike Gabriel2016-06-254-93/+0
| * hw/nxagent/NX*.c: Amend re-introduced nxagent warnings by fixing the correspo...Mike Gabriel2016-06-252-3/+1
| * hw/nxagent/NXdixfonts.c: Shrink file, drop duplicate code that can identicall...Mike Gabriel2016-06-253-1463/+29
| * hw/nxagent/NXdispatch.c: Shrink file, drop duplicate code that can identicall...Mike Gabriel2016-06-253-3342/+38
| * hw/nxagent/NXproperty.c: Shrink file, drop duplicate code that can identicall...Mike Gabriel2016-06-253-326/+8
| * hw/nxagent/NXshm.c: Shrink file, drop duplicate code that can identically be ...Mike Gabriel2016-06-253-964/+16
| * hw/nxagent/NXxvdisp.c: Shrink file, drop duplicate code that can identically ...Mike Gabriel2016-06-253-2079/+10
| * hw/nxagent/NXevents.c: Shrink file, drop duplicate code that can identically ...Mike Gabriel2016-06-253-4549/+143
| * hw/nxagent/NXglyph.c: Shrink file, drop duplicate code that can identically b...Mike Gabriel2016-06-253-394/+10
| * hw/nxagent/NXglyphcurs.c: Shrink file, drop duplicate code that can identical...Mike Gabriel2016-06-253-71/+5
| * hw/nxagent/NXrender.c: Shrink file, drop duplicate code that can identically ...Mike Gabriel2016-06-253-2191/+65
| * hw/nxagent/NX{glyphstr,picturestr}.h: Don't ship the complete header files in...Mike Gabriel2016-06-2513-837/+147
| * NXrenderint.h: Move into subfolder X11/include/ and rename to Xrender_nxagent...Mike Gabriel2016-06-252-2/+2
| * hw/nxagent/NXresource.c: Shrink file, drop duplicate code that can identicall...Mike Gabriel2016-06-253-644/+10
| * Xserver/dix/window.c: Don't reintroduce build warnings with previous commit d...Mike Gabriel2016-06-251-14/+0
| * hw/nxagent/NXwindow.c: Shrink file, drop duplicate code that can identically ...Mike Gabriel2016-06-254-3028/+60
| * hw/nxagent/NXglxext.c: Shrink file, drop duplicate code that can identically ...Mike Gabriel2016-06-253-382/+17
| * Xserver/GL/glx/Imakefile: Serialize parameters and make Imakefile changes mor...Mike Gabriel2016-06-251-23/+82
| * hw/nxagent/NXpicture.c: Shrink file, drop duplicate code that can identically...Mike Gabriel2016-06-253-1692/+54
| * hw/nxagent/NXmiexpose.c: Shrink file, drop duplicate code that can identicall...Mike Gabriel2016-06-253-249/+19
| * hw/nxagent/Pixmaps.h: Make RESTYPE well-defined by adding resource.h to inclu...Mike Gabriel2016-06-251-0/+1
| * Xserver/mi/Imakefile: Serialize parameters and make Imakefile changes more tr...Mike Gabriel2016-06-251-31/+98
| * hw/nxagent/NXmiglyph.c: Shrink file, drop code that can be identically found ...Mike Gabriel2016-06-253-87/+5
| * hw/nxagent/NXmitrap.c: Shrink file, drop duplicate code that can identically ...Mike Gabriel2016-06-254-122/+22
| * hw/nxagent/NXmiwindow.c: Drop complete file.Mike Gabriel2016-06-254-1215/+19
| * hw/nxagent/NXdamage.c: Shrink file, drop duplicate code that can identically ...Mike Gabriel2016-06-254-1894/+47
| * NXcomposite.h: Move fake header file NXcomposite.h to hw/nxagent/X11/include/...Mike Gabriel2016-06-253-74/+107
| * Xserver/hw/nxagent: Drop NXcompositeext.h, it is a duplicate of nx-X11/includ...Mike Gabriel2016-06-252-64/+0
| * hw/nxagent/NXextension.c: Shrink file, drop duplicate code that is indentical...Mike Gabriel2016-06-253-327/+15
| * Xserver/dix/Imakefile: Serialize parameters and make Imakefile changes more t...Mike Gabriel2016-06-251-16/+66
|/
* Merge branch 'uli42-pr/run_xinerama_without_debug_output' into 3.6.xMike Gabriel2016-06-251-5/+5
|\
| * libX11: Extend Event functions to handle IOErrorsUlrich Sibiller2016-06-256-0/+21
| * Screen.c: fix RRGetInfo callUlrich Sibiller2016-06-251-1/+1
| * Xinerama: undef debug/test flagsUlrich Sibiller2016-06-251-4/+4
* | Merge branch 'uli42-pr/fix-crash-in-XPeekEvent' into 3.6.xMike Gabriel2016-06-256-0/+21
|\ \ | |/ |/|
| * libX11: Extend Event functions to handle IOErrorsUlrich Sibiller2016-06-246-0/+21
|/
* Merge branch 'sunweaver-pr/xrandr-extension-upgrade-1.5' into 3.6.xMike Gabriel2016-06-2184-4884/+10220
|\
| * debian/patches: Update 102_xserver-xext_set-securitypolicy-path.debian.patch.Mike Gabriel2016-06-211-1/+1
| * Backport RANDR proto version 1.5 to nx-X11's Xserver.Mike Gabriel2016-06-2123-951/+6548
| * Move matrix operations from X server to pixman 0.13.2. Required code de-dupli...Mike Gabriel2016-06-211-6/+3
| * [render] Split out filter finding from filter setting. Required code de-dupli...Mike Gabriel2016-06-211-2/+4