aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/glx/glxscreens.c
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/released'marha2011-11-251-0/+10
|\ | | | | | | | | | | | | | | | | | | Conflicts: xorg-server/glx/glxdriswrast.c xorg-server/glx/single2.c xorg-server/hw/xwin/winconfig.c xorg-server/os/osinit.c xorg-server/os/xdmcp.c xorg-server/xkb/xkbInit.c
| * mesa xserver pixman git update 25 nov 2011marha2011-11-251-0/+10
| |
* | Merge remote-tracking branch 'origin/released'marha2011-07-011-426/+429
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/xwininfo/configure.ac libX11/configure.ac mesalib/src/glsl/ast_function.cpp mesalib/src/glsl/ast_to_hir.cpp mesalib/src/glsl/glsl_parser_extras.cpp mesalib/src/glsl/glsl_parser_extras.h mesalib/src/glsl/ir.cpp mesalib/src/glsl/ir.h mesalib/src/glsl/ir_constant_expression.cpp mesalib/src/glsl/ir_validate.cpp mesalib/src/glsl/lower_mat_op_to_vec.cpp mesalib/src/mesa/program/ir_to_mesa.cpp mesalib/src/mesa/state_tracker/st_cb_drawpixels.c mesalib/src/mesa/state_tracker/st_cb_texture.c mesalib/src/mesa/state_tracker/st_context.h mesalib/src/mesa/state_tracker/st_format.h mkfontscale/configure.ac xorg-server/Xext/xvmc.c xorg-server/configure.ac xorg-server/dix/Makefile.am xorg-server/fb/fbarc.c xorg-server/fb/fbgc.c xorg-server/glx/glapi_gentable.c xorg-server/glx/glxdri2.c xorg-server/glx/glxscreens.c xorg-server/hw/xfree86/Makefile.am xorg-server/hw/xfree86/loader/Makefile.am xorg-server/hw/xquartz/X11Application.m xorg-server/hw/xquartz/mach-startup/Makefile.am xorg-server/hw/xwin/XWin.rc xorg-server/hw/xwin/winmultiwindowwindow.c xorg-server/hw/xwin/winmultiwindowwndproc.c xorg-server/os/Makefile.am xorg-server/test/Makefile.am xorg-server/xfixes/region.c xorg-server/xkeyboard-config/symbols/ma
| * xwininfo libX11 mesa mkfontscale xserver xkeyboard-config git update 1 Julimarha2011-07-011-418/+425
| | | | | | | | 2011
* | Solved mistake in latest mergemarha2010-12-011-0/+4
| |
* | svn merge ^/branches/released .marha2010-12-011-31/+0
|\|
| * xserver libX11 libxcb update 1/12/2010marha2010-12-011-31/+0
| |
* | include unistd.h where strdup is used.marha2010-06-201-4/+0
| |
* | svn merge ^/branches/released .marha2010-06-161-3/+3
|\|
| * xserver and libxcb git update 11/6/2010marha2010-06-161-3/+3
| |
* | Solved compiler warningsmarha2010-06-141-0/+4
| |
* | svn merge ^/branches/released .marha2010-06-141-3/+3
|\|
| * xserver git update 14/6/2010marha2010-06-141-3/+3
| |
* | svn merge ^/branches/released .marha2010-06-111-2/+5
|\|
| * xserver git update 11/6/2010marha2010-06-111-2/+5
| |
| * xserver git update 15/5/2010marha2010-05-151-4/+4
| |
| * xserver git update 19/4/2010marha2010-04-191-28/+0
| |
* | svn merge -r588:HEAD ^/branches/released .marha2010-05-161-4/+4
| |
* | svn merge -r537:HEAD "^/branches/released" .marha2010-04-191-28/+0
| |
* | svn merge ^/branches/released .marha2010-02-281-0/+4
|\|
| * Some synchronisations with the jturney branchmarha2010-02-281-470/+474
| |
* | svn merge ^/branches/released .marha2010-01-141-0/+1
|\|
| * Git update 14/1/2010marha2010-01-141-0/+1
| |
* | svn merge ^/branches/releasedmarha2009-10-211-3/+12
|\|
| * Updated to xorg-server-1.7.99.1marha2009-10-211-3/+12
| |
* | svn merge https://vcxsrv.svn.sourceforge.net/svnroot/vcxsrv/branches/released .marha2009-10-051-516/+464
|\|
| * Updated tomarha2009-10-041-55/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | xkeyboard-config-1.7 pixman-0.16.2 libX11-1.3 libXinerama-1.1 xkbcomp-1.1.1 recordproto-1.14 xineramaproto-1.2 inputproto-2.0 compositeproto-0.4.1 xorg-server-1.7.0
* | svn merge https://vcxsrv.svn.sourceforge.net/svnroot/vcxsrv/branches/released .marha2009-09-091-4/+36
|\|
| * Switched to xorg-server-1.6.99.900.tar.gzmarha2009-09-061-4/+36
| |
* | svn merge file:///D:/svnrepos/vcxsrv/branches/released .marha2009-07-251-236/+112
|\|
| * Added xorg-server-1.6.2.tar.gzmarha2009-07-251-236/+112
| |
* | Changes for VC compilationmarha2009-07-121-0/+4
|/
* Checked in the following released items:marha2009-06-281-0/+604
xkeyboard-config-1.4.tar.gz ttf-bitstream-vera-1.10.tar.gz font-alias-1.0.1.tar.gz font-sun-misc-1.0.0.tar.gz font-sun-misc-1.0.0.tar.gz font-sony-misc-1.0.0.tar.gz font-schumacher-misc-1.0.0.tar.gz font-mutt-misc-1.0.0.tar.gz font-misc-misc-1.0.0.tar.gz font-misc-meltho-1.0.0.tar.gz font-micro-misc-1.0.0.tar.gz font-jis-misc-1.0.0.tar.gz font-isas-misc-1.0.0.tar.gz font-dec-misc-1.0.0.tar.gz font-daewoo-misc-1.0.0.tar.gz font-cursor-misc-1.0.0.tar.gz font-arabic-misc-1.0.0.tar.gz font-winitzki-cyrillic-1.0.0.tar.gz font-misc-cyrillic-1.0.0.tar.gz font-cronyx-cyrillic-1.0.0.tar.gz font-screen-cyrillic-1.0.1.tar.gz font-xfree86-type1-1.0.1.tar.gz font-adobe-utopia-type1-1.0.1.tar.gz font-ibm-type1-1.0.0.tar.gz font-bitstream-type1-1.0.0.tar.gz font-bitstream-speedo-1.0.0.tar.gz font-bh-ttf-1.0.0.tar.gz font-bh-type1-1.0.0.tar.gz font-bitstream-100dpi-1.0.0.tar.gz font-bh-lucidatypewriter-100dpi-1.0.0.tar.gz font-bh-100dpi-1.0.0.tar.gz font-adobe-utopia-100dpi-1.0.1.tar.gz font-adobe-100dpi-1.0.0.tar.gz font-util-1.0.1.tar.gz font-bitstream-75dpi-1.0.0.tar.gz font-bh-lucidatypewriter-75dpi-1.0.0.tar.gz font-adobe-utopia-75dpi-1.0.1.tar.gz font-bh-75dpi-1.0.0.tar.gz bdftopcf-1.0.1.tar.gz font-adobe-75dpi-1.0.0.tar.gz mkfontscale-1.0.6.tar.gz openssl-0.9.8k.tar.gz bigreqsproto-1.0.2.tar.gz xtrans-1.2.2.tar.gz resourceproto-1.0.2.tar.gz inputproto-1.4.4.tar.gz compositeproto-0.4.tar.gz damageproto-1.1.0.tar.gz zlib-1.2.3.tar.gz xkbcomp-1.0.5.tar.gz freetype-2.3.9.tar.gz pthreads-w32-2-8-0-release.tar.gz pixman-0.12.0.tar.gz kbproto-1.0.3.tar.gz evieext-1.0.2.tar.gz fixesproto-4.0.tar.gz recordproto-1.13.2.tar.gz randrproto-1.2.2.tar.gz scrnsaverproto-1.1.0.tar.gz renderproto-0.9.3.tar.gz xcmiscproto-1.1.2.tar.gz fontsproto-2.0.2.tar.gz xextproto-7.0.3.tar.gz xproto-7.0.14.tar.gz libXdmcp-1.0.2.tar.gz libxkbfile-1.0.5.tar.gz libfontenc-1.0.4.tar.gz libXfont-1.3.4.tar.gz libX11-1.1.5.tar.gz libXau-1.0.4.tar.gz libxcb-1.1.tar.gz xorg-server-1.5.3.tar.gz