aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mesa/main
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/released'marha2011-11-103-0/+141
|\
| * libX11 mesa git update 10 nov 2011marha2011-11-103-0/+141
| |
* | Merge remote-tracking branch 'origin/released'marha2011-11-0917-1128/+1384
|\| | | | | | | | | Conflicts: mesalib/src/mapi/glapi/glapi.h
| * libX11 mesa pixman git update 9 nov 2011marha2011-11-0917-1128/+1384
| |
* | Merge remote-tracking branch 'origin/released'marha2011-11-0438-5156/+6481
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mesalib/src/mesa/drivers/dri/swrast/swrast_priv.h xorg-server/hw/xwin/InitOutput.c xorg-server/hw/xwin/ddraw.h xorg-server/hw/xwin/winclipboardwndproc.c xorg-server/hw/xwin/winglobals.c xorg-server/hw/xwin/winmonitors.c xorg-server/hw/xwin/winprocarg.c xorg-server/hw/xwin/winwin32rootlesswndproc.c xorg-server/include/scrnintstr.h xorg-server/xkb/ddxList.c xorg-server/xkb/ddxLoad.c
| * xserver pixman mesa git update 4 nov 2011marha2011-11-0438-5156/+6481
| |
* | Merge remote-tracking branch 'origin/released'marha2011-10-284-944/+977
|\|
| * mesa git update 28 okt 2011marha2011-10-284-944/+977
| |
* | Merge remote-tracking branch 'origin/released'marha2011-10-2723-232/+325
|\|
| * mesa git update 27 okt 2011marha2011-10-274-6/+90
| |
| * libX11 libXft mesa mkfontscale pixman xserver git update 26 okt 2011marha2011-10-2623-226/+235
| |
* | Merge remote-tracking branch 'origin/released'marha2011-10-1920-1149/+1008
|\| | | | | | | | | Conflicts: xorg-server/include/os.h
| * libX11 libXext libXft mesa libxcb mkfontscale pixman xservermarha2011-10-1920-1149/+1008
| | | | | | | | xkeyboard-config git update 19 oct 2011
* | Merge remote-tracking branch 'origin/released'marha2011-10-1020-160/+356
|\|
| * fontconfig libX11 mesa pixman xkeyboard-config git updte 10 oct 2011marha2011-10-1020-160/+356
| |
* | Merge remote-tracking branch 'origin/released'marha2011-10-068-460/+223
|\|
| * upgraded to inputproto-2.1.99.1marha2011-10-068-460/+223
| | | | | | | | xwininfo fontconfig libXau mesa xkeyboard-config git update 6 oct 2011
* | Merge remote-tracking branch 'origin/released'marha2011-10-0574-7463/+8225
|\| | | | | | | | | | | | | | | | | Conflicts: mesalib/src/mapi/glapi/glapi.h mesalib/src/mesa/main/syncobj.h xorg-server/dix/events.c xorg-server/dix/getevents.c xorg-server/include/misc.h
| * mkfontscale pixman xserver xtrans libX11 libXdmcp libxcb libXmu mesa git ↵marha2011-10-0574-7463/+8225
| | | | | | | | update 5 oct 2011
* | Merge remote-tracking branch 'origin/released'marha2011-09-3010-238/+86
|\| | | | | | | | | Conflicts: openssl/Makefile
| * mesa xkeyboard-config git update 30 sep 2011marha2011-09-3010-238/+86
| |
* | Merge remote-tracking branch 'origin/released'marha2011-09-294-1/+29
|\|
| * xwininfo libXft mesa git update 29 sep 2011marha2011-09-294-1/+29
| |
* | Merge remote-tracking branch 'origin/released'marha2011-09-284-57/+188
|\|
| * mesa pixman xkeyboard-config git update 28 sep 2011marha2011-09-284-57/+188
| |
* | Merge remote-tracking branch 'origin/released'marha2011-09-276-375/+313
|\| | | | | | | | | | | | | | | | | Conflicts: mesalib/src/mesa/main/version.c xorg-server/include/globals.h xorg-server/mi/misprite.c xorg-server/mi/mivaltree.c xorg-server/os/utils.c
| * libX11 pixman mesa xserver git update 27 sep 2011marha2011-09-276-375/+313
| |
* | Merge remote-tracking branch 'origin/released'marha2011-09-268-342/+315
|\| | | | | | | | | Conflicts: libXmu/src/CmapAlloc.c
| * fontconfig libX11 libXext libXft libXmu mesa git update 26 sep 2011marha2011-09-268-342/+315
| |
* | Merge remote-tracking branch 'origin/released'marha2011-09-2223-1431/+1266
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-2223-1431/+1266
| |
* | Merge remote-tracking branch 'origin/released'marha2011-09-2020-4742/+3635
|\|
| * libX11 libxtrans mesa git update 20 sep 2011marha2011-09-2020-4742/+3635
| |
* | Merge remote-tracking branch 'origin/released'marha2011-09-1918-5850/+2362
|\| | | | | | | | | Conflicts: libfontenc/src/fontenc.c
| * xtrans libX11 libXext libXdmcp libXau libXft libXinerama libXmu libfontencmarha2011-09-1918-5850/+2362
| | | | | | | | mesa git update 19 sept 2011
* | Merge remote-tracking branch 'origin/released'marha2011-09-162-2/+15
|\|
| * git update libXext libXdmcp mesa xkeyboard-config 16 sep 2011marha2011-09-162-2/+15
| | | | | | | | X11/extensions: removed files that are in multiple extension modules
* | Merge remote-tracking branch 'origin/released'marha2011-09-159-910/+932
|\|
| * libxtrans libXmu libXext mesa pixman git update 15 sept 2011marha2011-09-159-910/+932
| |
* | Merge remote-tracking branch 'origin/released'marha2011-09-141-0/+23
|\|
| * mesa git update 14 sep 2011marha2011-09-141-0/+23
| |
* | Synchronised line endinge with release branchmarha2011-09-1271-83331/+83331
| |
* | Merge remote-tracking branch 'origin/released'marha2011-09-124-408/+411
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mesalib/src/glsl/ast_to_hir.cpp mesalib/src/glsl/glcpp/glcpp.c mesalib/src/mesa/drivers/dri/common/dri_util.c mesalib/src/mesa/drivers/dri/common/spantmp2.h mesalib/src/mesa/drivers/dri/common/utils.c mesalib/src/mesa/drivers/dri/swrast/swrast.c mesalib/src/mesa/program/ir_to_mesa.cpp mesalib/src/mesa/state_tracker/st_extensions.c mesalib/src/mesa/state_tracker/st_mesa_to_tgsi.c pixman/configure.ac pixman/pixman/pixman-arm-neon-asm.S pixman/test/Makefile.am pixman/test/utils.c pixman/test/utils.h
| * git update 12 sep 2011marha2011-09-124-408/+411
| |
* | Merge remote-tracking branch 'origin/released'marha2011-09-099-122/+1879
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mesalib/include/GL/internal/dri_interface.h mesalib/scons/gallium.py mesalib/src/glsl/ast_to_hir.cpp mesalib/src/glsl/glsl_parser_extras.cpp mesalib/src/glsl/ir_variable.cpp mesalib/src/glsl/linker.cpp mesalib/src/mesa/SConscript mesalib/src/mesa/drivers/common/driverfuncs.c mesalib/src/mesa/main/compiler.h mesalib/src/mesa/main/formats.c mesalib/src/mesa/main/formats.h mesalib/src/mesa/main/texcompress.c mesalib/src/mesa/main/texgetimage.c mesalib/src/mesa/sources.mak
| * mesa git update 9 sep 2011marha2011-09-099-122/+1879
| |
* | Merge remote-tracking branch 'origin/released'marha2011-09-0822-1851/+735
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mesalib/docs/relnotes.html mesalib/scons/gallium.py mesalib/src/mesa/drivers/common/driverfuncs.c mesalib/src/mesa/main/colortab.c mesalib/src/mesa/main/dd.h mesalib/src/mesa/main/enable.c mesalib/src/mesa/main/formats.c mesalib/src/mesa/main/framebuffer.c mesalib/src/mesa/main/get.c mesalib/src/mesa/main/mtypes.h mesalib/src/mesa/main/pack.c mesalib/src/mesa/main/texgetimage.c mesalib/src/mesa/main/teximage.c mesalib/src/mesa/main/texobj.c mesalib/src/mesa/main/texparam.c mesalib/src/mesa/main/texstate.c mesalib/src/mesa/swrast/s_drawpix.c mesalib/src/mesa/vbo/vbo_attrib_tmp.h
| * mesa git update 8 sep 2011marha2011-09-0822-1851/+735
| |
* | Merge remote-tracking branch 'origin/released'marha2011-09-068-6507/+7390
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mesalib/docs/GL3.txt mesalib/src/mapi/glapi/gen/Makefile mesalib/src/mapi/glapi/gen/gl_API.xml mesalib/src/mapi/glapi/glapi_mapi_tmp.h mesalib/src/mapi/glapi/glapi_sparc.S mesalib/src/mapi/glapi/glapi_x86-64.S mesalib/src/mapi/glapi/glapi_x86.S mesalib/src/mapi/glapi/glapitable.h mesalib/src/mapi/glapi/glapitemp.h mesalib/src/mapi/glapi/glprocs.h mesalib/src/mesa/main/dd.h mesalib/src/mesa/main/enums.c mesalib/src/mesa/main/mtypes.h mesalib/src/mesa/main/remap_helper.h mesalib/src/mesa/main/uniforms.c mesalib/src/mesa/state_tracker/st_draw.c mesalib/src/mesa/state_tracker/st_extensions.c mesalib/src/mesa/vbo/vbo_attrib_tmp.h mesalib/src/mesa/vbo/vbo_save_api.c
| * mesa git update 6 sep 2011marha2011-09-068-6507/+7390
| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-16 02:43:03 +0000