aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/glx
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/released'marha2011-12-291-1/+0
|\
| * xserver libX11 mesa xkeyboard-config git update 28 dec 2011marha2011-12-281-1/+0
| |
* | Solved compilation errorsmarha2011-12-231-1/+1
| |
* | Synchronised filesmarha2011-12-231-1/+11
| |
* | Back previous versionmarha2011-12-231-0/+1
| |
* | Removed unneeded source filemarha2011-12-231-1/+0
| |
* | Solved compile warningmarha2011-12-231-1/+1
| |
* | synchronised filesmarha2011-12-232-26/+24
| |
* | Added new sources to makefilesmarha2011-12-231-4/+4
| |
* | Merge remote-tracking branch 'origin/released'marha2011-12-2315-4206/+4294
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: xorg-server/glx/dispatch.h xorg-server/glx/glapi.c xorg-server/glx/indirect_dispatch.h xorg-server/glx/indirect_reqsize.c xorg-server/glx/indirect_reqsize.h xorg-server/glx/indirect_size.h xorg-server/glx/indirect_size_get.c xorg-server/glx/indirect_size_get.h xorg-server/glx/indirect_table.c xorg-server/mi/mieq.c
| * git mesa pixman xserver xkeyboard-config update 24 dec 2011marha2011-12-2322-11695/+22479
| |
* | Synchronised filesmarha2011-12-1510-1222/+1225
| |
* | Merge remote-tracking branch 'origin/released'marha2011-11-255-902/+935
|\| | | | | | | | | | | | | | | | | | | 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-255-886/+919
| |
* | Synchronised filesmarha2011-11-075-1578/+1716
| |
* | Synchronised filesmarha2011-10-053-166/+175
| |
* | Added swrast dll based on wglmarha2011-10-052-2/+15
| |
* | Merge remote-tracking branch 'origin/released'marha2011-09-221-238/+232
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: xorg-server/Xext/dpms.c xorg-server/Xext/saver.c xorg-server/Xext/security.c xorg-server/Xext/shape.c xorg-server/Xext/sync.c xorg-server/Xi/opendev.c xorg-server/fb/wfbrename.h xorg-server/glx/glxserver.h xorg-server/hw/xwin/winwindowswm.c xorg-server/mi/miarc.c xorg-server/mi/miwideline.c xorg-server/os/io.c xorg-server/render/mipict.c
| * libxtrans libX11 libX11 libXext mesa xserver git update 22 sep 2011marha2011-09-221-237/+231
| |
* | Synchronised line endinge with release branchmarha2011-09-128-9476/+9476
| |
* | Synchronised glx files with mesamarha2011-09-064-1691/+2603
| |
* | synchronised file (different file format: dos <> unix)marha2011-07-181-180/+180
| |
* | 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
| |