Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/released' | marha | 2011-06-03 | 2 | -299/+299 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 2 | -299/+299 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-05-29 | 3 | -199/+199 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 3 | -199/+199 |
| | | |||||
* | | merge ^/branches/released . | marha | 2011-05-16 | 6 | -269/+303 |
|\| | |||||
| * | xserver xkeyboar-config mesa git update 16 May 2011 | marha | 2011-05-16 | 6 | -369/+403 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-04-28 | 3 | -10/+12 |
|\| | |||||
| * | xserver xkeyboard-config mesa git update 28 Apr 2011 | marha | 2011-04-28 | 3 | -545/+547 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-04-27 | 4 | -8/+10 |
|\| | |||||
| * | xserver libX11 libxtrans mesa pixman xkeyboard-config git update 27 Apr 2011 | marha | 2011-04-27 | 4 | -151/+153 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-03-28 | 4 | -293/+279 |
|\| | |||||
| * | xserver xkeyboard-config mesa git update 28 Mar 2011 | marha | 2011-03-28 | 4 | -616/+602 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-03-20 | 2 | -1/+2 |
|\| | |||||
| * | xserver libX11 libxcb pixman mesa git update 20 Mar 2011 | marha | 2011-03-20 | 2 | -658/+659 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-03-17 | 1 | -0/+5 |
|\| | |||||
| * | xserver libX11 mesa git updaet 17 Mar 2011 | marha | 2011-03-17 | 1 | -0/+5 |
| | | |||||
* | | Synchronised with X11\extensions\XGBstr.h (so the debugger is not confused) | marha | 2011-03-16 | 1 | -1/+1 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-03-15 | 5 | -87/+103 |
|\| | |||||
| * | xserver libX11 libxcb mesa git update 15 Mar 2011 | marha | 2011-03-15 | 5 | -1346/+1362 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-03-10 | 5 | -147/+84 |
|\| | |||||
| * | xserver mesa git update 10 Mar 2011 | marha | 2011-03-10 | 5 | -609/+546 |
| | | |||||
* | | Enable only functions defined in windows XP | marha | 2011-03-09 | 1 | -1/+1 |
| | | | | | | | | | | Enabled IPV6 compilation | ||||
* | | svn merge ^/branches/released . | marha | 2011-03-04 | 13 | -2013/+2243 |
|\| | |||||
| * | xserver xkeyboard-config mesa git update 4 Marc 2011 | marha | 2011-03-04 | 13 | -2189/+2419 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-02-25 | 4 | -770/+771 |
|\| | |||||
| * | xserver randrproto mesa xkeyboard-config git update 25 Feb 2011 | marha | 2011-02-25 | 4 | -284/+285 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-02-20 | 1 | -1/+1 |
|\| | |||||
| * | xserver xkeyboard-config libX11 pixman mesa git update 2011 | marha | 2011-02-20 | 1 | -1/+1 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-02-03 | 1 | -246/+246 |
|\| | |||||
| * | libXext xserver libXau libX11 pixman mesa git update 3 Feb 2011 | marha | 2011-02-03 | 1 | -246/+246 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-01-21 | 3 | -1802/+1813 |
|\| | |||||
| * | xserver mesa xkbcomp libxcb git update 21 jan 2011 | marha | 2011-01-21 | 3 | -1802/+1813 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-01-19 | 1 | -573/+577 |
|\| | |||||
| * | xserver pixman mesa git update 19 jan 2011 | marha | 2011-01-19 | 1 | -569/+573 |
| | | |||||
* | | Prevent crash with remote font servers | marha | 2011-01-16 | 1 | -0/+5 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-01-08 | 6 | -11/+27 |
|\| | |||||
| * | xserver mesa libX11 xkbcomp pixman git update 8/1/2011 | marha | 2011-01-08 | 6 | -11/+27 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2010-12-12 | 4 | -4/+82 |
|\| | |||||
| * | xserver git update 10/12/2010 | marha | 2010-12-10 | 4 | -4/+82 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2010-12-08 | 3 | -2/+7 |
|\| | |||||
| * | xserver pixman git update 7-12-2010 | marha | 2010-12-07 | 3 | -2/+7 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2010-12-01 | 6 | -170/+1 |
|\| | |||||
| * | xserver libX11 libxcb update 1/12/2010 | marha | 2010-12-01 | 6 | -170/+1 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2010-11-30 | 1 | -1/+1 |
|\| | |||||
| * | libXext xserver libfontenc libX11 libxcb pixman git update 26 11 2010 | marha | 2010-11-26 | 1 | -1/+1 |
| | | |||||
* | | svn merge "^/branches/released" . | marha | 2010-11-15 | 9 | -600/+637 |
|\| | | | | | | | | | | | Solved mouse motion bug in new version of dix/getevents.c | ||||
| * | xserver pixman libX11 libXext 14/11/2010 | marha | 2010-11-14 | 9 | -600/+637 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2010-10-19 | 1 | -1/+1 |
|\| | |||||
| * | xserver update 19/10/2010 | marha | 2010-10-19 | 1 | -1/+1 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2010-10-14 | 3 | -92/+101 |
|\| |