aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/render
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/released'marha2012-01-131-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 2012marha2012-01-131-417/+420
| |
* | Merge remote-tracking branch 'origin/released'marha2011-12-161-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 2011marha2011-12-161-1/+2
| |
* | Merge remote-tracking branch 'origin/released'marha2011-11-254-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 2011marha2011-11-254-514/+511
| |
* | Merge remote-tracking branch 'origin/released'marha2011-10-274-197/+279
|\|
| * libX11 libXft mesa mkfontscale pixman xserver git update 26 okt 2011marha2011-10-264-197/+279
| |
* | Merge remote-tracking branch 'origin/released'marha2011-10-051-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 ↵marha2011-10-051-4/+0
| | | | | | | | update 5 oct 2011
* | Merge remote-tracking branch 'origin/released'marha2011-09-222-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 2011marha2011-09-222-848/+810
| |
* | Synchronised line endinge with release branchmarha2011-09-124-5891/+5891
| |
* | svn merge ^/branches/released .marha2011-04-282-107/+1
|\|
| * xserver xkeyboard-config mesa git update 28 Apr 2011marha2011-04-282-2534/+2428
| |
* | svn merge ^/branches/released .marha2011-04-141-3/+9
|\|
| * server xkeyboard-config mesa git update 14 Apr 2011marha2011-04-141-3/+9
| |
* | svn merge ^/branches/released .marha2011-04-051-13/+12
|\|
| * xserver xkeyboard-config libxcb xkbcomp mesa git update 5 Apr 2011marha2011-04-051-13/+12
| |
* | svn merge ^/branches/released .marha2011-03-301-3/+0
|\|
| * xserver mesa git update 30 Mar 2011marha2011-03-301-3/+0
| |
* | svn merge ^/branches/released .marha2011-03-241-20/+5
|\|
| * xserver xkeyboard-config libX11 pixman mesa git update 24 Mar 2011marha2011-03-241-20/+5
| |
* | svn merge ^/branches/released .marha2011-03-155-148/+54
|\|
| * xserver libX11 libxcb mesa git update 15 Mar 2011marha2011-03-155-974/+880
| |
* | svn merge ^/branches/released .marha2011-03-101-1/+1
|\|
| * xserver mesa git update 10 Mar 2011marha2011-03-101-3394/+3394
| |
* | svn merge ^/branches/released .marha2011-03-044-465/+269
|\|
| * xserver xkeyboard-config mesa git update 4 Marc 2011marha2011-03-044-972/+776
| |
* | svn merge ^/branches/released .marha2011-01-082-8/+21
|\|
| * xserver mesa libX11 xkbcomp pixman git update 8/1/2011marha2011-01-082-8/+21
| |
* | svn merge ^/branches/released .marha2010-12-291-2/+4
|\|
| * xserver and mesa git update 28-12-2010marha2010-12-281-2/+4
| |
* | svn merge ^/branches/released .marha2010-12-121-3/+5
|\|
| * xserver git update 10/12/2010marha2010-12-101-3/+5
| |
* | svn merge ^/branches/released .marha2010-12-081-2/+2
|\|
| * libXext xserver pixman git update 6-12-2010marha2010-12-061-2/+2
| |
* | svn merge ^/branches/released .marha2010-12-013-163/+159
|\|
| * xserver libX11 libxcb update 1/12/2010marha2010-12-013-163/+159
| |
* | svn merge "^/branches/released" .marha2010-11-156-234/+27
|\| | | | | | | | | | | Solved mouse motion bug in new version of dix/getevents.c
| * xserver pixman libX11 libXext 14/11/2010marha2010-11-145-232/+26
| |
* | svn merge ^/branches/released .marha2010-08-231-0/+8
|\|
| * xserver git update 20/8/2010marha2010-08-201-0/+8
| |
* | svn merge ^/branches/released .marha2010-06-118-353/+350
|\|
| * xserver git update 11/6/2010marha2010-06-118-353/+350
| |
* | svn merge "^/branches/released" .marha2010-05-204-3420/+3402
|\|
| * xserver git update 20/5/2010marha2010-05-204-3420/+3402
| |
| * xserver git update 17/5/2010marha2010-05-171-3363/+3370
| |
| * xserver git update 15/5/2010marha2010-05-159-3035/+3026
| |
| * xserver git update 9/5/2010marha2010-05-093-2602/+2561
| |