aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/released'marha2011-11-0719-2292/+2146
|\ | | | | | | | | Conflicts: pixman/pixman/pixman-mmx.c
| * xserver pixman mesa git update 7 nov 2011marha2011-11-0719-2292/+2146
| |
* | Solved mesa compile problemsmarha2011-11-041-1/+1
| |
* | Merge remote-tracking branch 'origin/released'marha2011-11-04119-15378/+14368
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-04119-15371/+14361
| |
* | Merge remote-tracking branch 'origin/released'marha2011-10-2813-1189/+1276
|\|
| * mesa git update 28 okt 2011marha2011-10-2813-1189/+1276
| |
* | Merge remote-tracking branch 'origin/released'marha2011-10-2764-665/+1434
|\|
| * mesa git update 27 okt 2011marha2011-10-279-70/+108
| |
| * libX11 libXft mesa mkfontscale pixman xserver git update 26 okt 2011marha2011-10-2661-595/+1326
| |
* | Removed useless codemarha2011-10-271-2/+0
| |
* | Solved link problemsmarha2011-10-191-0/+1
| |
* | Merge remote-tracking branch 'origin/released'marha2011-10-1962-3861/+3668
|\| | | | | | | | | Conflicts: xorg-server/include/os.h
| * libX11 libXext libXft mesa libxcb mkfontscale pixman xservermarha2011-10-1962-3861/+3668
| | | | | | | | xkeyboard-config git update 19 oct 2011
* | Merge remote-tracking branch 'origin/released'marha2011-10-1047-1943/+2976
|\|
| * fontconfig libX11 mesa pixman xkeyboard-config git updte 10 oct 2011marha2011-10-1047-1943/+2976
| |
* | 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
* | Merge remote-tracking branch 'origin/released'marha2011-10-05134-11035/+11918
|\| | | | | | | | | | | | | | | | | 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-05134-11035/+11918
| | | | | | | | 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-2911-14/+90
|\|
| * xwininfo libXft mesa git update 29 sep 2011marha2011-09-2911-14/+90
| |
* | Merge remote-tracking branch 'origin/released'marha2011-09-287-837/+905
|\|
| * mesa pixman xkeyboard-config git update 28 sep 2011marha2011-09-287-837/+905
| |
* | 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-2636-567/+693
|\| | | | | | | | | Conflicts: libXmu/src/CmapAlloc.c
| * fontconfig libX11 libXext libXft libXmu mesa git update 26 sep 2011marha2011-09-2636-567/+693
| |
* | Merge remote-tracking branch 'origin/released'marha2011-09-2241-5688/+5640
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-2241-5688/+5640
| |
* | 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-2028-4799/+3648
|\|
| * libX11 libxtrans mesa git update 20 sep 2011marha2011-09-2028-4799/+3648
| |
* | 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-1520-1996/+2006
|\|
| * libxtrans libXmu libXext mesa pixman git update 15 sept 2011marha2011-09-1520-1996/+2006
| |
* | Merge remote-tracking branch 'origin/released'marha2011-09-144-7/+29
|\|
| * mesa git update 14 sep 2011marha2011-09-144-7/+29
| |
* | Synchronised line endinge with release branchmarha2011-09-12193-247000/+247000
| |
* | 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
| |
* | Merge remote-tracking branch 'origin/released'marha2011-09-0920-415/+2600
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-0920-415/+2600
| |
* | Merge remote-tracking branch 'origin/released'marha2011-09-0832-5933/+4707
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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