aboutsummaryrefslogtreecommitdiff
path: root/mesalib
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/released'marha2011-10-0615-629/+734
|\
| * upgraded to inputproto-2.1.99.1marha2011-10-0615-629/+734
| | | | | | | | xwininfo fontconfig libXau mesa xkeyboard-config git update 6 oct 2011
* | Added new files to projectmarha2011-10-052-0/+8
| |
* | Merge remote-tracking branch 'origin/released'marha2011-10-05144-11125/+11998
|\| | | | | | | | | | | | | | | | | 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-05144-11125/+11998
| | | | | | | | update 5 oct 2011
* | Merge remote-tracking branch 'origin/released'marha2011-09-3014-286/+92
|\| | | | | | | | | Conflicts: openssl/Makefile
| * mesa xkeyboard-config git update 30 sep 2011marha2011-09-3014-286/+92
| |
* | Merge remote-tracking branch 'origin/released'marha2011-09-2913-18/+98
|\|
| * xwininfo libXft mesa git update 29 sep 2011marha2011-09-2913-18/+98
| |
* | Merge remote-tracking branch 'origin/released'marha2011-09-288-837/+909
|\|
| * mesa pixman xkeyboard-config git update 28 sep 2011marha2011-09-288-837/+909
| |
* | Added lower_clip_distance.cpp to project filemarha2011-09-275-304/+8
| |
* | Merge remote-tracking branch 'origin/released'marha2011-09-2712-548/+829
|\| | | | | | | | | | | | | | | | | 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-2712-548/+829
| |
* | Merge remote-tracking branch 'origin/released'marha2011-09-2637-567/+702
|\| | | | | | | | | Conflicts: libXmu/src/CmapAlloc.c
| * fontconfig libX11 libXext libXft libXmu mesa git update 26 sep 2011marha2011-09-2637-567/+702
| |
* | Merge remote-tracking branch 'origin/released'marha2011-09-2249-5722/+5999
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-2249-5722/+5999
| |
* | Merge remote-tracking branch 'origin/released'marha2011-09-211-0/+119
|\|
| * libxtrans libX11 libXext mesa git update 21 sep 2011marha2011-09-211-0/+119
| |
* | Merge remote-tracking branch 'origin/released'marha2011-09-2092-4908/+3668
|\|
| * libX11 libxtrans mesa git update 20 sep 2011marha2011-09-2092-4908/+3668
| |
* | texfetch.* -> s_texfetch.*marha2011-09-194-4/+4
| |
* | Merge remote-tracking branch 'origin/released'marha2011-09-1937-2916/+3051
|\| | | | | | | | | Conflicts: libfontenc/src/fontenc.c
| * xtrans libX11 libXext libXdmcp libXau libXft libXinerama libXmu libfontencmarha2011-09-1937-2916/+3051
| | | | | | | | mesa git update 19 sept 2011
* | Merge remote-tracking branch 'origin/released'marha2011-09-165-6/+131
|\|
| * git update libXext libXdmcp mesa xkeyboard-config 16 sep 2011marha2011-09-165-6/+131
| | | | | | | | X11/extensions: removed files that are in multiple extension modules
* | Merge remote-tracking branch 'origin/released'marha2011-09-1526-3080/+2006
|\|
| * libxtrans libXmu libXext mesa pixman git update 15 sept 2011marha2011-09-1526-3080/+2006
| |
* | Merge remote-tracking branch 'origin/released'marha2011-09-145-10/+34
|\|
| * mesa git update 14 sep 2011marha2011-09-145-10/+34
| |
* | Synchronised line endinge with release branchmarha2011-09-12209-251821/+251821
| |
* | Merge remote-tracking branch 'origin/released'marha2011-09-1226-3602/+3595
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-1226-3592/+3585
| |
* | format_unpack.c addedmarha2011-09-092-0/+4
| |
* | Merge remote-tracking branch 'origin/released'marha2011-09-0922-416/+2602
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-0922-416/+2602
| |
* | ignore pch dirmarha2011-09-081-0/+1
| |
* | Merge remote-tracking branch 'origin/released'marha2011-09-0853-7800/+4793
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-0853-7797/+4793
| |
* | solved compile errormarha2011-09-061-0/+3
| |
* | Merge remote-tracking branch 'origin/released'marha2011-09-0626-10765/+15043
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-0626-10765/+15043
| |
* | Merge remote-tracking branch 'origin/released'marha2011-09-0520-876/+999
|\| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: libxcb/src/xcb_in.c mesalib/src/mesa/main/formats.c mesalib/src/mesa/main/mtypes.h mesalib/src/mesa/program/ir_to_mesa.cpp mesalib/src/mesa/state_tracker/st_cb_bufferobjects.c mesalib/src/mesa/state_tracker/st_extensions.c mesalib/src/mesa/state_tracker/st_mesa_to_tgsi.c mesalib/src/mesa/swrast/s_context.c mesalib/src/mesa/swrast/s_readpix.c
| * git update libxcb mesa 5 sep 2011marha2011-09-058-159/+214
| |
| * mesa git update 1 Sep 2011marha2011-09-0114-717/+785
| |
* | Merge remote-tracking branch 'origin/released'marha2011-08-3124-3263/+2502
|\| | | | | | | | | | | | | | | | | | | | | Conflicts: mesalib/docs/README.WIN32 mesalib/docs/install.html mesalib/src/glu/sgi/include/gluos.h mesalib/src/mesa/drivers/windows/gdi/wgl.c mesalib/src/mesa/main/state.c mesalib/src/mesa/main/uniforms.c mesalib/src/mesa/tnl/t_draw.c
| * mesa git update 31 aug 2011marha2011-08-3124-3263/+2502
| |
* | Added s_texture.cmarha2011-08-302-0/+4
| |
* | Merge remote-tracking branch 'origin/released'marha2011-08-3027-671/+836
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mesalib/src/mesa/SConscript mesalib/src/mesa/drivers/common/driverfuncs.c mesalib/src/mesa/drivers/dri/common/texmem.c mesalib/src/mesa/main/context.c mesalib/src/mesa/main/dd.h mesalib/src/mesa/main/debug.h mesalib/src/mesa/main/fbobject.c mesalib/src/mesa/main/formats.c mesalib/src/mesa/main/formats.h mesalib/src/mesa/main/teximage.c mesalib/src/mesa/sources.mak mesalib/src/mesa/state_tracker/st_cb_texture.c
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-11 01:25:11 +0000