Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/released' | marha | 2011-06-07 | 1 | -1/+2 |
|\ | | | | | | | | | Conflicts: xorg-server/randr/rrcrtc.c | ||||
| * | git update xserver mesa 7 Jun 2011 | marha | 2011-06-07 | 1 | -1/+2 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-06-03 | 1 | -0/+8 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 1 | -0/+8 |
| | | |||||
| * | mesa pixman xkeyboard-config git update 1 Jun 2011 | marha | 2011-06-01 | 8 | -782/+839 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-05-30 | 8 | -782/+839 |
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 8 | -782/+839 |
| |/ | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-05-29 | 7 | -816/+824 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 7 | -816/+824 |
| | | |||||
* | | merge ^/branches/released . | marha | 2011-05-25 | 1 | -905/+551 |
|\| | |||||
| * | xkeyboard-config libX11 pixman mesa git update 25 May 2011 | marha | 2011-05-25 | 1 | -1692/+1338 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-05-22 | 5 | -11/+15 |
|\| | |||||
| * | xserver xkeyboard-config libX11 randrproto pixman glproto mesa git update 22 ↵ | marha | 2011-05-22 | 5 | -649/+653 |
| | | | | | | | | May 2011 | ||||
* | | merge ^/branches/released . | marha | 2011-05-16 | 6 | -157/+233 |
|\| | |||||
| * | xserver xkeyboar-config mesa git update 16 May 2011 | marha | 2011-05-16 | 6 | -433/+509 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-05-09 | 2 | -0/+11 |
|\| | |||||
| * | libXext libX11 mkfontscale mesa git update 9 May 2011 | marha | 2011-05-09 | 2 | -598/+609 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-05-03 | 1 | -39/+71 |
|\| | |||||
| * | xkeyboard libxcb pixman mesa git update 2 May 2011 | marha | 2011-05-03 | 1 | -39/+71 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-05-02 | 2 | -12/+0 |
|\| | |||||
| * | mesa git update 1 May 2011 | marha | 2011-05-02 | 2 | -1553/+1541 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-04-30 | 3 | -0/+51 |
|\| | |||||
| * | xserver mesa xkeyboard-config git update 30 Apr 2011 | marha | 2011-04-30 | 3 | -3782/+3833 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-04-28 | 3 | -6/+27 |
|\| | |||||
| * | xserver xkeyboard-config mesa git update 28 Apr 2011 | marha | 2011-04-28 | 3 | -795/+816 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-04-27 | 6 | -48/+40 |
|\| | |||||
| * | xserver libX11 libxtrans mesa pixman xkeyboard-config git update 27 Apr 2011 | marha | 2011-04-27 | 6 | -501/+493 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-04-15 | 4 | -2/+275 |
|\| | |||||
| * | xserver xkeyboard-config libX11 mesa git update 15 April 2011 | marha | 2011-04-15 | 4 | -2/+275 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-04-14 | 1 | -4/+8 |
|\| | |||||
| * | server xkeyboard-config mesa git update 14 Apr 2011 | marha | 2011-04-14 | 1 | -4/+8 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-04-12 | 6 | -24/+55 |
|\| | |||||
| * | mesa libXext pixman git update 12 Apr 2011 | marha | 2011-04-12 | 6 | -3028/+3059 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-04-10 | 7 | -374/+399 |
|\| | |||||
| * | mesa git update | marha | 2011-04-10 | 7 | -1664/+1689 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-04-06 | 3 | -4/+7 |
|\| | |||||
| * | xserver libX11 libxcb mesa git update 6 Apr 2011 | marha | 2011-04-06 | 3 | -893/+896 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-04-05 | 2 | -59/+93 |
|\| | |||||
| * | xserver xkeyboard-config libxcb xkbcomp mesa git update 5 Apr 2011 | marha | 2011-04-05 | 2 | -700/+734 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-03-30 | 8 | -12/+331 |
|\| | |||||
| * | mesa git update 30 Mar 2011 | marha | 2011-03-30 | 8 | -2754/+3073 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-03-28 | 1 | -0/+3 |
|\| | |||||
| * | xserver xkeyboard-config mesa git update 28 Mar 2011 | marha | 2011-03-28 | 1 | -208/+211 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-03-17 | 3 | -4/+4 |
|\| | |||||
| * | xserver libX11 mesa git updaet 17 Mar 2011 | marha | 2011-03-17 | 3 | -1843/+1843 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-03-15 | 5 | -5/+112 |
|\| | |||||
| * | xserver libX11 libxcb mesa git update 15 Mar 2011 | marha | 2011-03-15 | 5 | -767/+874 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-03-13 | 2 | -17/+39 |
|\| | |||||
| * | xkeyboard-config libxcb pixman mesalib git update 13 Mar 2011 | marha | 2011-03-13 | 2 | -580/+602 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-03-12 | 12 | -293/+249 |
|\| |