aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/glx
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/released'marha2011-07-141-166/+165
|\ | | | | | | | | | | | | | | | | | | | | Conflicts: mesalib/src/mesa/state_tracker/st_context.c xorg-server/hw/xquartz/GL/indirect.c xorg-server/hw/xwin/glx/indirect.c xorg-server/hw/xwin/glx/wgl_ext_api.c xorg-server/hw/xwin/glx/winpriv.c xorg-server/hw/xwin/man/XWin.man xorg-server/hw/xwin/winmultiwindowwindow.c
| * mesa xserver git update 14 july 2011marha2011-07-141-166/+165
| |
* | Merge remote-tracking branch 'origin/released'marha2011-07-014-435/+440
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-014-426/+438
| | | | | | | | 2011
* | Synchronised files with mesamarha2011-06-212-19/+28
| |
* | Syncrhonised file with mesamarha2011-06-161-1084/+2644
| |
* | Merge remote-tracking branch 'origin/released'marha2011-06-163-101/+7688
|\| | | | | | | | | | | | | | | Conflicts: xorg-server/glx/glapi.h xorg-server/hw/xquartz/GL/indirect.c xorg-server/hw/xquartz/X11Application.m xorg-server/xkeyboard-config/symbols/jp
| * xserver xkeyboard-config xkbcomp git update 16 June 2011marha2011-06-163-101/+7688
| |
* | Synchronised filesmarha2011-06-091-12/+7
| |
* | Synchronised files with mesamarha2011-06-033-1743/+1760
| |
* | merge ^/branches/released .marha2011-05-241-0/+5
|\|
* | svn merge ^/branches/released .marha2011-05-221-2784/+10211
|\|
* | svn merge ^/branches/released .marha2011-05-031-151/+159
|\|
* | svn merge ^/branches/released .marha2011-04-301-1/+1
|\|
| * xserver mesa xkeyboard-config git update 30 Apr 2011marha2011-04-301-101/+101
| |
* | Synchronised filesmarha2011-04-291-3/+2
| |
* | svn merge ^/branches/released .marha2011-04-284-11/+16
|\|
| * xserver xkeyboard-config mesa git update 28 Apr 2011marha2011-04-284-1816/+1821
| |
* | svn merge ^/branches/released .marha2011-04-2712-1578/+1770
|\|
| * xserver libX11 libxtrans mesa pixman xkeyboard-config git update 27 Apr 2011marha2011-04-274-3772/+3783
| |
* | svn merge ^/branches/released .marha2011-04-125-1608/+1735
|\|
* | svn merge ^/branches/released .marha2011-04-063-1646/+1655
|\|
* | Synchronised filesmarha2011-04-011-3/+13
| |
* | svn merge ^/branches/released .marha2011-03-3024-10390/+1773
|\|
| * xserver mesa git update 30 Mar 2011marha2011-03-3015-9351/+2173
| |
* | Solved link errors. Functions not implementedmarha2011-03-301-3/+3
| |
* | svn merge ^/branches/released .marha2011-03-308-1773/+1806
|\|
* | Synchronised filesmarha2011-03-283-4/+4
| |
* | svn merge ^/branches/released .marha2011-03-283-1347/+1347
|\|
| * xserver xkeyboard-config mesa git update 28 Mar 2011marha2011-03-283-4/+4
| |
* | svn merge ^/branches/released .marha2011-03-1510-1250/+1243
|\|
| * xserver libX11 libxcb mesa git update 15 Mar 2011marha2011-03-155-151/+126
| |
* | svn merge ^/branches/released .marha2011-03-103-243/+74
|\|
| * xserver mesa git update 10 Mar 2011marha2011-03-104-453/+5
| |
* | Remove GLXversionmarha2011-03-071-1/+0
| |
* | Synchronize Xserver glx/rensize.c with mesa src/glx/compsize.cmarha2011-03-071-0/+2
| |
* | svn merge ^/branches/released .marha2011-02-202-3292/+3317
|\|
| * xserver xkeyboard-config libX11 pixman mesa git update 2011marha2011-02-202-3277/+3302
| |
* | Define _GLAPI_NO_EXPORTS in glx makefile to solve compilation problem due to ↵marha2011-01-261-1/+1
| | | | | | | | latest change in glapi.h
* | Synchronised filesmarha2011-01-261-5/+0
| |
* | svn merge ^/branches/released .marha2011-01-193-3186/+3482
|\|
| * xserver pixman mesa git update 19 jan 2011marha2011-01-193-3167/+3463
| |
* | Previous fix in glxext.c was to drastically. It could cause crashes.marha2011-01-172-3/+13
| |
* | Reverted. Checked in by accidentmarha2011-01-161-2/+2
| |
* | svn merge ^/branches/released .marha2011-01-165-1755/+1905
|\|
* | svn merge ^/branches/released .marha2011-01-082-2/+2
|\|
| * xserver mesa libX11 xkbcomp pixman git update 8/1/2011marha2011-01-082-2/+2
| |
* | Do not clear currentcontexts in DrawableGone. This is causing jedit not to ↵marha2010-12-291-1/+2
| | | | | | | | display when opengl is enabled in java.
* | synchronised with mesamarha2010-12-291-36/+52
| |
* | Synchronised with mesamarha2010-12-291-195/+541
| |