Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/released' | marha | 2011-06-09 | 2 | -5/+314 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 2 | -5/+314 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-06-05 | 1 | -15/+0 |
|\| | | | | | | | | | | | | | | | | | | | Conflicts: libX11/specs/i18n/trans/trans.xml mesalib/src/glsl/glsl_parser_extras.cpp mesalib/src/glsl/ir_print_visitor.cpp xorg-server/xkeyboard-config/rules/base.xml.in xorg-server/xkeyboard-config/rules/xkb.dtd xorg-server/xkeyboard-config/symbols/de | ||||
| * | libX11 libXext libXmu mesa xkeyboard-config git update Jun 2011 | marha | 2011-06-05 | 1 | -15/+0 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-06-03 | 4 | -337/+356 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mesalib/configs/linux-dri mesalib/src/gallium/auxiliary/util/u_math.h mesalib/src/mapi/glapi/gen/Makefile mesalib/src/mapi/glapi/glapi_mapi_tmp.h mesalib/src/mapi/glapi/glapi_sparc.S mesalib/src/mapi/glapi/glapi_x86-64.S mesalib/src/mapi/glapi/glapi_x86.S mesalib/src/mapi/glapi/glapitable.h mesalib/src/mapi/glapi/glapitemp.h mesalib/src/mapi/glapi/glprocs.h mesalib/src/mesa/drivers/dri/Makefile.template mesalib/src/mesa/main/dd.h mesalib/src/mesa/main/fbobject.c mesalib/src/mesa/main/remap_helper.h mesalib/src/mesa/main/shaderapi.c mesalib/src/mesa/main/teximage.c mesalib/src/mesa/main/uniforms.c mesalib/src/mesa/state_tracker/st_format.c mesalib/src/mesa/vbo/vbo_exec_array.c xorg-server/configure.ac xorg-server/dix/main.c xorg-server/dix/window.c xorg-server/hw/xquartz/GL/indirect.c xorg-server/hw/xquartz/X11Application.m xorg-server/hw/xquartz/darwin.c xorg-server/hw/xquartz/darwin.h xorg-server/hw/xquartz/mach-startup/Makefile.am xorg-server/hw/xquartz/pbproxy/app-main.m xorg-server/hw/xquartz/pbproxy/pbproxy.h xorg-server/hw/xquartz/pbproxy/x-selection.m xorg-server/hw/xquartz/xpr/xpr.h xorg-server/hw/xquartz/xpr/xprEvent.c xorg-server/hw/xquartz/xpr/xprScreen.c xorg-server/include/privates.h xorg-server/include/protocol-versions.h xorg-server/test/Makefile.am xorg-server/xfixes/cursor.c xorg-server/xfixes/xfixes.c xorg-server/xkeyboard-config/configure.in xorg-server/xkeyboard-config/rules/base.extras.xml.in xorg-server/xkeyboard-config/rules/base.xml.in xorg-server/xkeyboard-config/symbols/de xorg-server/xkeyboard-config/symbols/lk xorg-server/xkeyboard-config/symbols/ru | ||||
| * | xserver xkeyboard-config mesa git update 3 Jun 2011 | marha | 2011-06-03 | 4 | -337/+356 |
| | | |||||
* | | merge ^/branches/released . | marha | 2011-05-25 | 1 | -2/+2 |
|\| | |||||
| * | xkeyboard-config libX11 pixman mesa git update 25 May 2011 | marha | 2011-05-25 | 1 | -1873/+1873 |
| | | |||||
* | | Removed change compared to released version. Was causing problem with alt gr ↵ | marha | 2011-05-23 | 1 | -1/+1 |
| | | | | | | | | key in belgian keyboard | ||||
* | | svn merge ^/branches/released . | marha | 2011-05-22 | 1 | -331/+331 |
|\| | |||||
| * | xserver xkeyboard-config libX11 randrproto pixman glproto mesa git update 22 ↵ | marha | 2011-05-22 | 1 | -331/+331 |
| | | | | | | | | May 2011 | ||||
* | | merge ^/branches/released . | marha | 2011-05-18 | 3 | -13/+89 |
|\| | |||||
| * | xkeyboard-config libX11 pixman mesa git update 18 May 2011 | marha | 2011-05-18 | 3 | -311/+387 |
| | | |||||
* | | merge ^/branches/released . | marha | 2011-05-16 | 4 | -2/+464 |
|\| | |||||
| * | xserver xkeyboar-config mesa git update 16 May 2011 | marha | 2011-05-16 | 4 | -216/+678 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-05-03 | 3 | -493/+1449 |
|\| | |||||
| * | xkeyboard libxcb pixman mesa git update 2 May 2011 | marha | 2011-05-03 | 3 | -2/+958 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-04-30 | 1 | -2/+2 |
|\| | |||||
| * | xserver mesa xkeyboard-config git update 30 Apr 2011 | marha | 2011-04-30 | 1 | -311/+311 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-04-29 | 1 | -9/+2 |
|\| | |||||
| * | xserver mesa git update 28 Apr 2011 | marha | 2011-04-29 | 1 | -9/+2 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-04-28 | 1 | -1/+1 |
|\| | |||||
| * | xserver xkeyboard-config mesa git update 28 Apr 2011 | marha | 2011-04-28 | 1 | -1/+1 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-04-27 | 4 | -300/+300 |
|\| | |||||
| * | xserver libX11 libxtrans mesa pixman xkeyboard-config git update 27 Apr 2011 | marha | 2011-04-27 | 4 | -5/+5 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-04-15 | 2 | -38/+41 |
|\| | |||||
| * | xserver xkeyboard-config libX11 mesa git update 15 April 2011 | marha | 2011-04-15 | 2 | -38/+41 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-04-14 | 1 | -1/+1 |
|\| | |||||
| * | server xkeyboard-config mesa git update 14 Apr 2011 | marha | 2011-04-14 | 1 | -1/+1 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-04-13 | 54 | -343/+737 |
|\| | |||||
| * | xkeyboard-config libxcb libX11 git update 13 April 2011 | marha | 2011-04-13 | 54 | -5880/+6274 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-04-05 | 44 | -408/+344 |
|\| | |||||
| * | xserver xkeyboard-config libxcb xkbcomp mesa git update 5 Apr 2011 | marha | 2011-04-05 | 44 | -8430/+8366 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-03-28 | 1 | -55/+50 |
|\| | |||||
| * | xserver xkeyboard-config mesa git update 28 Mar 2011 | marha | 2011-03-28 | 1 | -63/+58 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-03-24 | 4 | -36/+69 |
|\| | |||||
| * | xserver xkeyboard-config libX11 pixman mesa git update 24 Mar 2011 | marha | 2011-03-24 | 4 | -581/+614 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-03-20 | 2 | -5/+10 |
|\| | |||||
| * | xserver libX11 libxcb pixman mesa git update 20 Mar 2011 | marha | 2011-03-20 | 2 | -9/+14 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-03-13 | 1 | -0/+13 |
|\| | |||||
| * | xkeyboard-config libxcb pixman mesalib git update 13 Mar 2011 | marha | 2011-03-13 | 1 | -0/+13 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-03-08 | 1 | -0/+83 |
|\| | |||||
| * | xkeyboard-config mesa git update 8 Mar 2011 | marha | 2011-03-08 | 1 | -1340/+1423 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-03-05 | 3 | -2/+75 |
|\| | |||||
| * | xserver libxcb mesa git update 5 Mar 2011 | marha | 2011-03-05 | 2 | -41/+114 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-03-04 | 16 | -602/+640 |
|\| | |||||
| * | xserver xkeyboard-config mesa git update 4 Marc 2011 | marha | 2011-03-04 | 13 | -3338/+3385 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-02-28 | 5 | -55/+70 |
|\| | |||||
| * | xserver libX11 Xextproto mesa Git update 28 Feb 2011 | marha | 2011-02-28 | 5 | -732/+747 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-02-20 | 171 | -14906/+14537 |
|\| |