Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/released' | marha | 2011-06-03 | 25 | -19884/+19861 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 25 | -19884/+19861 |
| | | |||||
| * | mesa pixman xkeyboard-config git update 1 Jun 2011 | marha | 2011-06-01 | 10 | -1401/+1457 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-05-30 | 10 | -1401/+1457 |
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mesalib/src/mesa/main/shaderapi.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_cb_texture.c mesalib/src/mesa/state_tracker/st_context.h mesalib/src/mesa/state_tracker/st_format.c | ||||
| * | | mesa git update 30 May 2011 | marha | 2011-05-30 | 10 | -1401/+1457 |
| |/ | |||||
* | | Added gitignore files | marha | 2011-05-30 | 3 | -0/+12 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-05-29 | 18 | -2239/+2630 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: libX11/specs/libX11/CH08.xml mesalib/src/mesa/main/dlist.c mesalib/src/mesa/main/fbobject.c mesalib/src/mesa/main/queryobj.c mesalib/src/mesa/main/shaderapi.c mesalib/src/mesa/main/teximage.c mesalib/src/mesa/program/ir_to_mesa.cpp mesalib/src/mesa/state_tracker/st_atom_pixeltransfer.c mesalib/src/mesa/state_tracker/st_cb_bufferobjects.c mesalib/src/mesa/state_tracker/st_cb_drawpixels.c mesalib/src/mesa/state_tracker/st_cb_readpixels.c mesalib/src/mesa/state_tracker/st_cb_texture.c mkfontscale/list.h pixman/pixman/Makefile.win32 xorg-server/dix/devices.c xorg-server/dix/events.c xorg-server/dix/inpututils.c xorg-server/fb/fbbltone.c xorg-server/hw/kdrive/ephyr/ephyr.c xorg-server/hw/kdrive/ephyr/ephyrinit.c xorg-server/hw/xfree86/common/xf86Module.h xorg-server/hw/xfree86/common/xf86Xinput.c xorg-server/hw/xfree86/man/xorg.conf.man xorg-server/hw/xwin/winkeybd.c xorg-server/hw/xwin/winmouse.c xorg-server/include/input.h xorg-server/include/inputstr.h xorg-server/mi/mieq.c xorg-server/randr/rrscreen.c xorg-server/xkeyboard-config/rules/base.extras.xml.in xorg-server/xkeyboard-config/rules/base.xml.in | ||||
| * | libX11 mesa mkfontscale pixman xserver git update 29 Mar 2011 | marha | 2011-05-29 | 18 | -2857/+3248 |
| | | |||||
* | | merge ^/branches/released . | marha | 2011-05-25 | 2 | -1006/+570 |
|\| | |||||
| * | xkeyboard-config libX11 pixman mesa git update 25 May 2011 | marha | 2011-05-25 | 2 | -2643/+2207 |
| | | |||||
* | | merge ^/branches/released . | marha | 2011-05-24 | 4 | -6/+9 |
|\| | |||||
| * | xserver mesa git update 24 May 2011 | marha | 2011-05-24 | 4 | -3117/+3120 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-05-22 | 20 | -2827/+10709 |
|\| | |||||
| * | xserver xkeyboard-config libX11 randrproto pixman glproto mesa git update 22 ↵ | marha | 2011-05-22 | 20 | -14290/+22169 |
| | | | | | | | | May 2011 | ||||
* | | merge ^/branches/released . | marha | 2011-05-18 | 4 | -23/+23 |
|\| | |||||
| * | xkeyboard-config libX11 pixman mesa git update 18 May 2011 | marha | 2011-05-18 | 4 | -3208/+3208 |
| | | |||||
* | | merge ^/branches/released . | marha | 2011-05-16 | 8 | -188/+280 |
|\| | |||||
| * | xserver xkeyboar-config mesa git update 16 May 2011 | marha | 2011-05-16 | 8 | -1706/+1798 |
| | | |||||
* | | merge ^/branches/released . | marha | 2011-05-13 | 2 | -1/+2 |
|\| | |||||
| * | mesa git update 13 May 2011 | marha | 2011-05-13 | 2 | -1/+2 |
| | | |||||
* | | merge ^/branches/released . | marha | 2011-05-12 | 2 | -3/+9 |
|\| | |||||
| * | libxcb mesa xcb-proto git update 12 May 2011 | marha | 2011-05-12 | 2 | -3/+9 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-05-10 | 7 | -17/+41 |
|\| | |||||
| * | libfontenc pixman mesa git update 10 May 2011 | marha | 2011-05-10 | 7 | -17/+41 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-05-09 | 9 | -6/+108 |
|\| | |||||
| * | libXext libX11 mkfontscale mesa git update 9 May 2011 | marha | 2011-05-09 | 9 | -2062/+2164 |
| | | |||||
* | | Bumped version to 1.10.11.10.1 | marha | 2011-05-05 | 1 | -1/+1 |
|\| | | | | | | | | | | | Added release note svn merge ^/branches/released . | ||||
| * | libX11 libxcb mesa git update 5 May 2011 | marha | 2011-05-05 | 1 | -1/+1 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-05-04 | 3 | -110/+1 |
|\| | |||||
| * | libX11 mesa glproto git update 4 May 2011 | marha | 2011-05-04 | 3 | -110/+1 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-05-03 | 18 | -1702/+1910 |
|\| | |||||
| * | xkeyboard libxcb pixman mesa git update 2 May 2011 | marha | 2011-05-03 | 18 | -4125/+4333 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-05-02 | 9 | -48/+29 |
|\| | |||||
| * | mesa git update 1 May 2011 | marha | 2011-05-02 | 9 | -9861/+9842 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-04-30 | 153 | -494/+35422 |
|\| | |||||
| * | Added extra needed files | marha | 2011-04-30 | 133 | -0/+34328 |
| | | |||||
| * | xserver mesa xkeyboard-config git update 30 Apr 2011 | marha | 2011-04-30 | 20 | -33512/+34112 |
| | | |||||
* | | Synchronised files | marha | 2011-04-29 | 1 | -4/+2 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-04-29 | 1 | -0/+7 |
|\| | |||||
| * | xserver mesa git update 28 Apr 2011 | marha | 2011-04-29 | 1 | -1089/+1096 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-04-28 | 7 | -8/+41 |
|\| | |||||
| * | xserver xkeyboard-config mesa git update 28 Apr 2011 | marha | 2011-04-28 | 7 | -797/+830 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-04-27 | 94 | -25501/+26278 |
|\| | |||||
| * | xserver libX11 libxtrans mesa pixman xkeyboard-config git update 27 Apr 2011 | marha | 2011-04-27 | 94 | -28726/+29503 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-04-15 | 14 | -1907/+2427 |
|\| | |||||
| * | xserver xkeyboard-config libX11 mesa git update 15 April 2011 | marha | 2011-04-15 | 14 | -3628/+4148 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-04-14 | 13 | -2169/+2208 |
|\| | |||||
| * | server xkeyboard-config mesa git update 14 Apr 2011 | marha | 2011-04-14 | 13 | -2609/+2648 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-04-12 | 47 | -7745/+10409 |
|\| | |||||
| * | mesa libXext pixman git update 12 Apr 2011 | marha | 2011-04-12 | 47 | -120739/+123402 |
| | |