Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/released' | marha | 2011-07-22 | 1 | -0/+10 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mesalib/src/gallium/auxiliary/util/u_vbuf_mgr.c mesalib/src/glsl/ast_function.cpp mesalib/src/glsl/ast_to_hir.cpp mesalib/src/glsl/glsl_types.cpp mesalib/src/glsl/ir.cpp mesalib/src/glsl/ir.h mesalib/src/glsl/linker.cpp mesalib/src/glsl/s_expression.cpp mesalib/src/mesa/drivers/common/driverfuncs.c mesalib/src/mesa/main/dd.h mesalib/src/mesa/main/fbobject.c mesalib/src/mesa/main/teximage.c mesalib/src/mesa/state_tracker/st_cb_texture.c | ||||
| * | mesa git update 22 July 2011 | marha | 2011-07-22 | 1 | -0/+10 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-06-20 | 1 | -27/+31 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mesalib/common.py mesalib/scons/custom.py mesalib/scons/gallium.py mesalib/src/gallium/auxiliary/util/u_vbuf_mgr.c mesalib/src/mesa/main/fbobject.c mesalib/src/mesa/main/teximage.c mesalib/src/mesa/main/texobj.c mesalib/src/mesa/state_tracker/st_format.c xorg-server/configure.ac xorg-server/exa/exa_unaccel.c | ||||
| * | libX11 xserver mesa git update 20 June 2011 | marha | 2011-06-20 | 1 | -27/+31 |
| | | |||||
* | | merge ^/branches/released . | marha | 2011-05-18 | 1 | -1/+6 |
|\| | |||||
| * | xkeyboard-config libX11 pixman mesa git update 18 May 2011 | marha | 2011-05-18 | 1 | -1/+6 |
| | | |||||
* | | merge ^/branches/released . | marha | 2011-05-16 | 1 | -15/+47 |
|\| | |||||
| * | xserver xkeyboar-config mesa git update 16 May 2011 | marha | 2011-05-16 | 1 | -613/+645 |
|/ | |||||
* | Added extra needed files | marha | 2011-04-30 | 1 | -0/+613 |