Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/released' | marha | 2011-11-09 | 1 | -4/+79 |
|\ | | | | | | | | | Conflicts: mesalib/src/mapi/glapi/glapi.h | ||||
| * | libX11 mesa pixman git update 9 nov 2011 | marha | 2011-11-09 | 1 | -4/+79 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-11-04 | 1 | -0/+1 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 2011 | marha | 2011-11-04 | 1 | -0/+1 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-09-12 | 1 | -1/+1 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 2011 | marha | 2011-09-12 | 1 | -1/+1 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-08-09 | 1 | -2/+1 |
|\| | | | | | | | | | | | | | | | | | | | | | Conflicts: X11/extensions/randr.h mesalib/src/glsl/ast_function.cpp mesalib/src/glsl/ast_to_hir.cpp mesalib/src/glsl/glsl_parser_extras.h mesalib/src/glsl/link_functions.cpp mesalib/src/glsl/linker.cpp mesalib/src/mesa/state_tracker/st_program.c | ||||
| * | xrandrproto mesa git update 9 aug 2011 | marha | 2011-08-09 | 1 | -2/+1 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-02-01 | 1 | -6/+6 |
|\| | |||||
| * | libX11 libXinerama mesa git update 1 Feb 2011 | marha | 2011-02-01 | 1 | -5/+5 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-01-27 | 1 | -732/+740 |
|\| | |||||
| * | pixman and mesalib git update 27 jan 2011 | marha | 2011-01-27 | 1 | -728/+736 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-01-22 | 1 | -751/+732 |
|\| | |||||
| * | mesalib git update 22/1/2011 | marha | 2011-01-22 | 1 | -747/+728 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-01-19 | 1 | -729/+751 |
|\| | |||||
| * | xserver pixman mesa git update 19 jan 2011 | marha | 2011-01-19 | 1 | -725/+747 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-01-08 | 1 | -1/+5 |
|\| | |||||
| * | xserver mesa libX11 xkbcomp pixman git update 8/1/2011 | marha | 2011-01-08 | 1 | -1/+5 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2010-12-29 | 1 | -702/+725 |
|\| | |||||
| * | xserver and mesa git update 28-12-2010 | marha | 2010-12-28 | 1 | -698/+721 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2010-11-29 | 1 | -0/+4 |
|/ | |||||
* | Updated to mesalib 7.9 | marha | 2010-11-22 | 1 | -0/+698 |