Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/released' | marha | 2012-01-13 | 1 | -417/+420 |
|\ | | | | | | | | | | | | | | | | | | | | | | | Conflicts: libxcb/src/xcb_auth.c libxcb/src/xcb_conn.c libxcb/src/xcb_out.c libxcb/src/xcb_util.c xorg-server/dix/dispatch.c xorg-server/include/dixstruct.h xorg-server/include/misc.h xorg-server/os/connection.c | ||||
| * | libxtrans libXdmcp libxcb mesa xserver git update 13 jan 2012 | marha | 2012-01-13 | 1 | -417/+420 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-12-16 | 1 | -1/+2 |
|\| | | | | | | | | | | | | | | | | | Conflicts: xorg-server/dix/dispatch.c xorg-server/dix/registry.c xorg-server/include/resource.h xorg-server/os/access.c xorg-server/os/auth.c | ||||
| * | xserver git update 16 dec 2011 | marha | 2011-12-16 | 1 | -1/+2 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-11-25 | 4 | -514/+511 |
|\| | | | | | | | | | | | | | | | | | | | Conflicts: xorg-server/glx/glxdriswrast.c xorg-server/glx/single2.c xorg-server/hw/xwin/winconfig.c xorg-server/os/osinit.c xorg-server/os/xdmcp.c xorg-server/xkb/xkbInit.c | ||||
| * | mesa xserver pixman git update 25 nov 2011 | marha | 2011-11-25 | 4 | -514/+511 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-10-27 | 4 | -197/+279 |
|\| | |||||
| * | libX11 libXft mesa mkfontscale pixman xserver git update 26 okt 2011 | marha | 2011-10-26 | 4 | -197/+279 |
| | | |||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-10-05 | 1 | -4/+0 |
|\| | | | | | | | | | | | | | | | | | Conflicts: mesalib/src/mapi/glapi/glapi.h mesalib/src/mesa/main/syncobj.h xorg-server/dix/events.c xorg-server/dix/getevents.c xorg-server/include/misc.h | ||||
| * | mkfontscale pixman xserver xtrans libX11 libXdmcp libxcb libXmu mesa git ↵ | marha | 2011-10-05 | 1 | -4/+0 |
| | | | | | | | | update 5 oct 2011 | ||||
* | | Merge remote-tracking branch 'origin/released' | marha | 2011-09-22 | 2 | -848/+810 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: xorg-server/Xext/dpms.c xorg-server/Xext/saver.c xorg-server/Xext/security.c xorg-server/Xext/shape.c xorg-server/Xext/sync.c xorg-server/Xi/opendev.c xorg-server/fb/wfbrename.h xorg-server/glx/glxserver.h xorg-server/hw/xwin/winwindowswm.c xorg-server/mi/miarc.c xorg-server/mi/miwideline.c xorg-server/os/io.c xorg-server/render/mipict.c | ||||
| * | libxtrans libX11 libX11 libXext mesa xserver git update 22 sep 2011 | marha | 2011-09-22 | 2 | -848/+810 |
| | | |||||
* | | Synchronised line endinge with release branch | marha | 2011-09-12 | 4 | -5891/+5891 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-04-28 | 2 | -107/+1 |
|\| | |||||
| * | xserver xkeyboard-config mesa git update 28 Apr 2011 | marha | 2011-04-28 | 2 | -2534/+2428 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-04-14 | 1 | -3/+9 |
|\| | |||||
| * | server xkeyboard-config mesa git update 14 Apr 2011 | marha | 2011-04-14 | 1 | -3/+9 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-04-05 | 1 | -13/+12 |
|\| | |||||
| * | xserver xkeyboard-config libxcb xkbcomp mesa git update 5 Apr 2011 | marha | 2011-04-05 | 1 | -13/+12 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-03-30 | 1 | -3/+0 |
|\| | |||||
| * | xserver mesa git update 30 Mar 2011 | marha | 2011-03-30 | 1 | -3/+0 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-03-24 | 1 | -20/+5 |
|\| | |||||
| * | xserver xkeyboard-config libX11 pixman mesa git update 24 Mar 2011 | marha | 2011-03-24 | 1 | -20/+5 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-03-15 | 5 | -148/+54 |
|\| | |||||
| * | xserver libX11 libxcb mesa git update 15 Mar 2011 | marha | 2011-03-15 | 5 | -974/+880 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-03-10 | 1 | -1/+1 |
|\| | |||||
| * | xserver mesa git update 10 Mar 2011 | marha | 2011-03-10 | 1 | -3394/+3394 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-03-04 | 4 | -465/+269 |
|\| | |||||
| * | xserver xkeyboard-config mesa git update 4 Marc 2011 | marha | 2011-03-04 | 4 | -972/+776 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2011-01-08 | 2 | -8/+21 |
|\| | |||||
| * | xserver mesa libX11 xkbcomp pixman git update 8/1/2011 | marha | 2011-01-08 | 2 | -8/+21 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2010-12-29 | 1 | -2/+4 |
|\| | |||||
| * | xserver and mesa git update 28-12-2010 | marha | 2010-12-28 | 1 | -2/+4 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2010-12-12 | 1 | -3/+5 |
|\| | |||||
| * | xserver git update 10/12/2010 | marha | 2010-12-10 | 1 | -3/+5 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2010-12-08 | 1 | -2/+2 |
|\| | |||||
| * | libXext xserver pixman git update 6-12-2010 | marha | 2010-12-06 | 1 | -2/+2 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2010-12-01 | 3 | -163/+159 |
|\| | |||||
| * | xserver libX11 libxcb update 1/12/2010 | marha | 2010-12-01 | 3 | -163/+159 |
| | | |||||
* | | svn merge "^/branches/released" . | marha | 2010-11-15 | 6 | -234/+27 |
|\| | | | | | | | | | | | Solved mouse motion bug in new version of dix/getevents.c | ||||
| * | xserver pixman libX11 libXext 14/11/2010 | marha | 2010-11-14 | 5 | -232/+26 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2010-08-23 | 1 | -0/+8 |
|\| | |||||
| * | xserver git update 20/8/2010 | marha | 2010-08-20 | 1 | -0/+8 |
| | | |||||
* | | svn merge ^/branches/released . | marha | 2010-06-11 | 8 | -353/+350 |
|\| | |||||
| * | xserver git update 11/6/2010 | marha | 2010-06-11 | 8 | -353/+350 |
| | | |||||
* | | svn merge "^/branches/released" . | marha | 2010-05-20 | 4 | -3420/+3402 |
|\| | |||||
| * | xserver git update 20/5/2010 | marha | 2010-05-20 | 4 | -3420/+3402 |
| | | |||||
| * | xserver git update 17/5/2010 | marha | 2010-05-17 | 1 | -3363/+3370 |
| | | |||||
| * | xserver git update 15/5/2010 | marha | 2010-05-15 | 9 | -3035/+3026 |
| | | |||||
| * | xserver git update 9/5/2010 | marha | 2010-05-09 | 3 | -2602/+2561 |
| | |