Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Synchronised line endinge with release branch | marha | 2011-09-12 | 1 | -1618/+1618 |
| | |||||
* | Merge remote-tracking branch 'origin/released' | marha | 2011-08-05 | 1 | -1/+2 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mesalib/src/glsl/ast_to_hir.cpp mesalib/src/mesa/SConscript mesalib/src/mesa/main/compiler.h mesalib/src/mesa/main/enable.c mesalib/src/mesa/main/ff_fragment_shader.cpp mesalib/src/mesa/main/texcompress_rgtc_tmp.h mesalib/src/mesa/main/texobj.c mesalib/src/mesa/main/texparam.c mesalib/src/mesa/main/uniforms.c mesalib/src/mesa/program/ir_to_mesa.cpp mesalib/src/mesa/program/prog_print.c mesalib/src/mesa/program/prog_statevars.c mesalib/src/mesa/program/program.c mesalib/src/mesa/program/program_parse.y mesalib/src/mesa/program/program_parser.h mesalib/src/mesa/program/sampler.cpp mesalib/src/mesa/sources.mak mesalib/src/mesa/state_tracker/st_atom_pixeltransfer.c mesalib/src/mesa/state_tracker/st_cb_blit.c mesalib/src/mesa/state_tracker/st_cb_drawpixels.c mesalib/src/mesa/state_tracker/st_extensions.c mesalib/src/mesa/state_tracker/st_mesa_to_tgsi.c mesalib/src/mesa/state_tracker/st_program.c mesalib/src/mesa/state_tracker/st_texture.h mesalib/src/mesa/vbo/vbo_exec_array.c pixman/pixman/pixman-arm-neon-asm.S pixman/pixman/pixman-arm-neon.c | ||||
| * | mesa pixman git update 5 aug 2011 | marha | 2011-08-05 | 1 | -1/+2 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-07-29 | 1 | -2/+1 |
|\| | | | | | | | | | | | | | | | | | Conflicts: libX11/configure.ac mesalib/src/mesa/main/ff_fragment_shader.cpp mesalib/src/mesa/main/framebuffer.c mesalib/src/mesa/main/texparam.c pixman/pixman/pixman-arm-neon-asm.S | ||||
| * | libX11 mesa pixman git update 29 jul 2011 | marha | 2011-07-29 | 1 | -2/+1 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-04-27 | 1 | -25/+19 |
|\| | |||||
| * | xserver libX11 libxtrans mesa pixman xkeyboard-config git update 27 Apr 2011 | marha | 2011-04-27 | 1 | -25/+19 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-04-12 | 1 | -3/+4 |
|\| | |||||
| * | mesa libXext pixman git update 12 Apr 2011 | marha | 2011-04-12 | 1 | -3/+4 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-03-30 | 1 | -2/+2 |
|\| | |||||
| * | mesa git update 30 Mar 2011 | marha | 2011-03-30 | 1 | -1623/+1623 |
|/ | |||||
* | xkeyboard-config libxcb pixman mesalib git update 13 Mar 2011 | marha | 2011-03-13 | 1 | -658/+777 |
| | |||||
* | libX11 pixman mesa git update 12 Mar 2011 | marha | 2011-03-12 | 1 | -0/+1504 |