Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/released' | marha | 2011-08-09 | 1 | -3/+364 |
|\ | | | | | | | | | | | | | | | | | | | | | 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 | -3/+364 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-07-15 | 2 | -746/+0 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: libX11/configure.ac mesalib/configs/linux-dri mesalib/docs/download.html mesalib/src/SConscript mesalib/src/mesa/main/bufferobj.c mesalib/src/mesa/main/bufferobj.h mesalib/src/mesa/main/framebuffer.c mesalib/src/mesa/main/renderbuffer.c mesalib/src/mesa/main/renderbuffer.h mesalib/src/mesa/main/texobj.c mesalib/src/mesa/program/program.c mesalib/src/mesa/vbo/vbo_exec_array.c xorg-server/dix/window.c xorg-server/xkb/xkb.c xorg-server/xkb/xkmread.c | ||||
| * | xserver libX11 mesa git update 15 July | marha | 2011-07-15 | 2 | -746/+0 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-07-12 | 1 | -11049/+11127 |
|\| | | | | | | | | | | | | | Conflicts: mesalib/src/mesa/main/depthstencil.c mesalib/src/mesa/main/formats.c mesalib/src/mesa/state_tracker/st_cb_drawpixels.c | ||||
| * | mesa git update 12 July 2011 | marha | 2011-07-12 | 1 | -11049/+11127 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-06-27 | 2 | -0/+11 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/xwininfo/configure.ac apps/xwininfo/xwininfo.c fontconfig/src/fcmatch.c mesalib/include/GL/internal/dri_interface.h mesalib/src/glsl/main.cpp mesalib/src/mesa/main/pack.c mesalib/src/mesa/main/renderbuffer.c mesalib/src/mesa/main/renderbuffer.h mesalib/src/mesa/main/teximage.c mesalib/src/mesa/state_tracker/st_cb_texture.c mesalib/src/mesa/state_tracker/st_draw.c mesalib/src/mesa/state_tracker/st_format.c pixman/configure.ac pixman/pixman/pixman-arm-neon-asm.S pixman/test/blitters-test.c | ||||
| * | xwininfo fontconfig mesa pixman git update 27 June 2011 | marha | 2011-06-27 | 2 | -0/+11 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-06-09 | 1 | -0/+1 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mesalib/include/GL/internal/dri_interface.h mesalib/src/gallium/auxiliary/util/u_math.h mesalib/src/mapi/glapi/gen/Makefile mesalib/src/mapi/glapi/gen/gl_table.py mesalib/src/mesa/SConscript mesalib/src/mesa/main/dlist.c mesalib/src/mesa/main/es_generator.py mesalib/src/mesa/main/imports.h mesalib/src/mesa/main/teximage.c mesalib/src/mesa/main/uniforms.c mesalib/src/mesa/state_tracker/st_draw.c mesalib/src/mesa/state_tracker/st_program.c mesalib/src/mesa/vbo/vbo_save_api.c xorg-server/xkeyboard-config/configure.in xorg-server/xkeyboard-config/rules/Makefile.am xorg-server/xkeyboard-config/rules/base.xml.in xorg-server/xkeyboard-config/symbols/cz xorg-server/xkeyboard-config/symbols/in | ||||
| * | mesa xkbcomp xkeyboard-config git update 9 Jun 2011 | marha | 2011-06-09 | 1 | -0/+1 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-05-30 | 15 | -5602/+5602 |
|\| | |||||
| * | Synchronised files. The revision number was removed | marha | 2011-05-30 | 15 | -5602/+5602 |
| | | |||||
| * | xserver xkeyboard-config libX11 randrproto pixman glproto mesa git update 22 ↵ | marha | 2011-05-22 | 1 | -398/+398 |
| | | | | | | | | May 2011 | ||||
* | | merge ^/branches/released . | marha | 2011-05-13 | 1 | -353/+353 |
|\| | |||||
| * | mesa git update 13 May 2011 | marha | 2011-05-13 | 1 | -1/+1 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-05-09 | 2 | -0/+2 |
|\| | |||||
| * | libXext libX11 mkfontscale mesa git update 9 May 2011 | marha | 2011-05-09 | 2 | -397/+399 |
| | | |||||
| * | xserver mesa xkeyboard-config git update 30 Apr 2011 | marha | 2011-04-30 | 2 | -523/+523 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-04-27 | 2 | -4/+3 |
|\| | |||||
| * | xserver libX11 libxtrans mesa pixman xkeyboard-config git update 27 Apr 2011 | marha | 2011-04-27 | 2 | -524/+523 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-03-20 | 1 | -2241/+2241 |
|\| | |||||
| * | xserver libX11 libxcb pixman mesa git update 20 Mar 2011 | marha | 2011-03-20 | 1 | -2241/+2241 |
| | | |||||
| * | xserver libxcb mesa git update 5 Mar 2011 | marha | 2011-03-05 | 1 | -398/+398 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-03-02 | 1 | -0/+14 |
|\| | |||||
| * | xkeyboard-config mesa git update 2 Mar 2011 | marha | 2011-03-02 | 1 | -384/+398 |
| | | |||||
| * | xkeyboard-config pixman xkbcompt mesa git update 12 Feb 2011 | marha | 2011-02-12 | 1 | -126/+126 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-02-10 | 1 | -0/+6 |
|\| | |||||
| * | libX11 mesa git update 10 Feb 2011 | marha | 2011-02-10 | 1 | -120/+126 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-02-09 | 1 | -881/+889 |
|\| | |||||
| * | libX11 mesa git update 9 Feb 2011 | marha | 2011-02-09 | 1 | -0/+8 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-02-04 | 1 | -1/+8 |
|\| | |||||
| * | libfontenc libXinerama mesa git update 4 feb 2011 | marha | 2011-02-04 | 1 | -1/+8 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-01-28 | 1 | -873/+874 |
|\| | |||||
| * | libfontenc libXau libxcb mesalib git update 28 jan 2011 | marha | 2011-01-28 | 1 | -871/+872 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-01-13 | 1 | -329/+329 |
|\| | |||||
| * | mesalib pixman xkbcomp git update 13 jan 2011 | marha | 2011-01-13 | 1 | -329/+329 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-01-12 | 1 | -864/+873 |
|\| | |||||
| * | xkeyboard-config libX11 mesalib git update 12 jan 2011 | marha | 2011-01-12 | 1 | -862/+871 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-01-08 | 1 | -2/+12 |
|\| | |||||
| * | xserver mesa libX11 xkbcomp pixman git update 8/1/2011 | marha | 2011-01-08 | 1 | -2/+12 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2010-12-29 | 19 | -17936/+18899 |
|\| | |||||
| * | xserver and mesa git update 28-12-2010 | marha | 2010-12-28 | 19 | -17936/+18899 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2010-11-29 | 20 | -868/+2753 |
|\| | |||||
| * | Updated to mesalib 7.9 | marha | 2010-11-22 | 19 | -868/+2625 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2010-07-28 | 2 | -1595/+2215 |
|\| | |||||
| * | Update to mesa 7,8,2 | marha | 2010-07-28 | 2 | -1595/+2215 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2010-06-16 | 1 | -103/+106 |
|\| | |||||
| * | Updated to mesa-7.8.1 | marha | 2010-06-16 | 1 | -103/+106 |
| | | |||||
| * | Updated to following packages: | marha | 2010-04-02 | 17 | -417/+1763 |
| | | | | | | | | | | mesa-7.8 | ||||
* | | svn merge -r524:HEAD "^/branches/released" . | marha | 2010-04-12 | 17 | -417/+1763 |
| | |