Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Synchronised line endinge with release branch | marha | 2011-09-12 | 7 | -3397/+3397 |
| | |||||
* | Merge remote-tracking branch 'origin/released' | marha | 2011-08-04 | 1 | -697/+701 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mesalib/src/glsl/link_functions.cpp mesalib/src/glsl/linker.cpp mesalib/src/glsl/main.cpp mesalib/src/mesa/program/ir_to_mesa.cpp xorg-server/composite/compalloc.c xorg-server/configure.ac xorg-server/hw/xquartz/X11Application.m xorg-server/hw/xquartz/bundle/Makefile.am xorg-server/hw/xquartz/xpr/xprFrame.c xorg-server/include/windowstr.h | ||||
| * | randrproto mesa xserver git update 4 aug 2011 | marha | 2011-08-04 | 1 | -697/+701 |
| | | |||||
* | | Solved possible crash because of invalid valdata pointers | marha | 2011-07-15 | 2 | -5/+11 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-07-04 | 1 | -1/+1 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mesalib/common.py mesalib/docs/GL3.txt mesalib/scons/custom.py mesalib/scons/gallium.py mesalib/src/SConscript xorg-server/Xext/xtest.c xorg-server/dix/getevents.c xorg-server/dix/window.c xorg-server/exa/exa_accel.c xorg-server/exa/exa_migration_classic.c xorg-server/exa/exa_unaccel.c xorg-server/hw/kdrive/ephyr/ephyr.c xorg-server/hw/kdrive/ephyr/ephyr.h xorg-server/hw/kdrive/ephyr/ephyrinit.c xorg-server/hw/kdrive/ephyr/hostx.c xorg-server/hw/kdrive/src/kdrive.h xorg-server/hw/kdrive/src/kinput.c xorg-server/hw/xfree86/common/xf86Init.c xorg-server/hw/xfree86/dri2/dri2.c xorg-server/hw/xnest/Init.c xorg-server/hw/xquartz/darwin.c xorg-server/hw/xquartz/darwinEvents.c xorg-server/hw/xquartz/darwinEvents.h xorg-server/hw/xquartz/darwinXinput.c xorg-server/hw/xwin/InitInput.c xorg-server/include/input.h xorg-server/include/window.h xorg-server/mi/mipointer.c xorg-server/test/Makefile.am xorg-server/test/xi2/protocol-eventconvert.c | ||||
| * | xserver mesa git update 4 July 2011 | marha | 2011-07-04 | 1 | -1/+1 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-05-29 | 1 | -0/+1 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 1 | -0/+1 |
| | | |||||
* | | merge ^/branches/released . | marha | 2011-05-23 | 1 | -8/+8 |
|\| | |||||
| * | xserver git update 23 May 2011 | marha | 2011-05-23 | 1 | -8/+8 |
| | | |||||
* | | merge ^/branches/released . | marha | 2011-05-16 | 2 | -46/+17 |
|\| | |||||
| * | xserver xkeyboar-config mesa git update 16 May 2011 | marha | 2011-05-16 | 2 | -45/+17 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-04-05 | 5 | -12/+9 |
|\| | |||||
| * | xserver xkeyboard-config libxcb xkbcomp mesa git update 5 Apr 2011 | marha | 2011-04-05 | 5 | -2279/+2276 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-03-15 | 3 | -23/+31 |
|\| | |||||
| * | xserver libX11 libxcb mesa git update 15 Mar 2011 | marha | 2011-03-15 | 3 | -1733/+1741 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-03-04 | 5 | -122/+223 |
|\| | |||||
| * | xserver xkeyboard-config mesa git update 4 Marc 2011 | marha | 2011-03-04 | 5 | -2722/+2823 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-01-21 | 1 | -2/+0 |
|\| | |||||
| * | xserver mesa xkbcomp libxcb git update 21 jan 2011 | marha | 2011-01-21 | 1 | -2/+0 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-01-08 | 2 | -51/+77 |
|\| | |||||
| * | xserver mesa libX11 xkbcomp pixman git update 8/1/2011 | marha | 2011-01-08 | 2 | -51/+77 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2010-12-12 | 1 | -1/+1 |
|\| | |||||
| * | xserver git update 10/12/2010 | marha | 2010-12-10 | 1 | -1/+1 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2010-12-08 | 1 | -1/+8 |
|\| | |||||
| * | xserver pixman git update 7-12-2010 | marha | 2010-12-07 | 1 | -1/+8 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2010-12-01 | 8 | -244/+117 |
|\| | |||||
| * | xserver libX11 libxcb update 1/12/2010 | marha | 2010-12-01 | 7 | -243/+117 |
| | | |||||
* | | svn merge "^/branches/released" . | marha | 2010-11-15 | 3 | -3/+7 |
|\| | | | | | | | | | | | Solved mouse motion bug in new version of dix/getevents.c | ||||
| * | xserver pixman libX11 libXext 14/11/2010 | marha | 2010-11-14 | 3 | -3/+7 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2010-09-27 | 1 | -23/+19 |
|\| | |||||
| * | xserver xkbcomp libxcb pixman git update 24/9/2010 | marha | 2010-09-24 | 1 | -23/+19 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2010-09-14 | 1 | -2/+0 |
|\| | |||||
| * | xserver libX11 pixman git update 14/9/2010 | marha | 2010-09-14 | 1 | -2/+0 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2010-09-11 | 1 | -4/+1 |
|\| | |||||
| * | xserver git update 11/9/2010 | marha | 2010-09-11 | 1 | -4/+1 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2010-07-10 | 1 | -1/+1 |
|\| | |||||
| * | git update 10/7/2010 | marha | 2010-07-10 | 1 | -1/+1 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2010-07-07 | 1 | -19/+5 |
|\| | |||||
| * | git update 7/7/2010 | marha | 2010-07-07 | 1 | -19/+5 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2010-07-02 | 2 | -0/+21 |
|\| | |||||
| * | git update 2/7/2010 | marha | 2010-07-02 | 2 | -0/+21 |
| | | |||||
* | | svn merge "^/branches/released" . | marha | 2010-06-23 | 1 | -1/+1 |
|\| | |||||
| * | xserver git update 23/6/2010 | marha | 2010-06-23 | 1 | -1/+1 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2010-06-11 | 29 | -4759/+2558 |
|\| | |||||
| * | xserver git update 11/6/2010 | marha | 2010-06-11 | 28 | -4758/+2558 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2010-05-26 | 1 | -7/+6 |
|\| | |||||
| * | xserver git update 26/5/2010 | marha | 2010-05-26 | 1 | -7/+6 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2010-05-25 | 1 | -1/+1 |
|\| | |||||
| * | xserver git update 25/5/2010 | marha | 2010-05-25 | 1 | -1/+1 |
| | |