aboutsummaryrefslogtreecommitdiff
path: root/pixman
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/released'marha2012-03-091-1/+1
|\ | | | | | | | | Conflicts: libxcb/src/xcb_in.c
| * libxcb fontconfig pixman mesa git update 9 Mar 2012marha2012-03-092-2/+2
| |
* | Merge remote-tracking branch 'origin/released'marha2012-03-081-0/+4
|\| | | | | | | | | Conflicts: pixman/pixman/pixman-mmx.c
| * fontconfig libXau libXdmcp libXext libXft libXinerama libXmu pixman mesamarha2012-03-081-0/+4
| | | | | | | | git update 8 Mar 2012
* | Merge remote-tracking branch 'origin/released'marha2012-03-058-52/+301
|\|
| * libfontenc xserver pixman mesa git update 5 Mar 2012marha2012-03-058-52/+301
| | | | | | | | | | | | | | font-util-1.3.0 xclock-1.0.6 libXfont-1.4.5 inputproto-2.2
* | Merge remote-tracking branch 'origin/released'marha2012-02-291-11/+44
|\|
| * xserver fontconfig mesa pixman git update 29 Feb 2012marha2012-02-291-11/+44
| |
* | Solved compilation warningsmarha2012-02-271-3/+15
| |
* | Merge remote-tracking branch 'origin/released'marha2012-02-2711-181/+1274
|\| | | | | | | | | Conflicts: pixman/pixman/pixman-mmx.c
| * fontconfig pixman mesa git update 27 Feb 2012marha2012-02-2711-169/+1274
| |
* | Merge remote-tracking branch 'origin/released'marha2012-02-241-20/+5
|\|
| * fontconfig libX11 pixman xserver git update 24 Feb 2012marha2012-02-241-20/+5
| |
* | Solved run-time errors due to type casting in debugmarha2012-02-231-3/+3
| |
* | Compilation problem solvedmarha2012-02-221-2/+6
| |
* | Merge remote-tracking branch 'origin/released'marha2012-02-223-64/+65
|\|
| * fontconfig libX11 libxcb mesa pixman xserver git update 22 Feb 2012marha2012-02-223-64/+65
| |
* | Merge remote-tracking branch 'origin/released'marha2012-02-013-9/+50
|\|
| * xserver mesa pixman xkbcomp xkeyboard-config git update 1 feb 2012marha2012-02-013-9/+50
| |
* | Avoid run-time type cast exceptions in debugmarha2012-01-231-3/+3
| |
* | Merge remote-tracking branch 'origin/released'marha2012-01-178-412/+495
|\|
| * git update mesa pixman xserver 17 jan 2012marha2012-01-178-412/+495
| |
* | Merge remote-tracking branch 'origin/released'marha2012-01-1111-277/+317
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: pixman/pixman/pixman-trap.c xorg-server/Xext/xace.c xorg-server/dix/dispatch.c xorg-server/hw/xwin/winclipboardthread.c xorg-server/hw/xwin/winengine.c xorg-server/hw/xwin/winwin32rootlesswindow.c xorg-server/include/dixstruct.h xorg-server/os/connection.c
| * mesa pixman xserver git update 11 jan 2012marha2012-01-1112-278/+318
| |
* | Merge remote-tracking branch 'origin/released'marha2012-01-063-19/+27
|\| | | | | | | | | | | Conflicts: mesalib/src/glsl/link_uniforms.cpp mesalib/src/mesa/drivers/dri/common/drisw_util.c
| * libX11 mesa pixman git update 6 jan 2012marha2012-01-063-19/+27
| |
* | Merge remote-tracking branch 'origin/released'marha2011-12-232-0/+12
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: xorg-server/glx/dispatch.h xorg-server/glx/glapi.c xorg-server/glx/indirect_dispatch.h xorg-server/glx/indirect_reqsize.c xorg-server/glx/indirect_reqsize.h xorg-server/glx/indirect_size.h xorg-server/glx/indirect_size_get.c xorg-server/glx/indirect_size_get.h xorg-server/glx/indirect_table.c xorg-server/mi/mieq.c
| * git mesa pixman xserver xkeyboard-config update 24 dec 2011marha2011-12-232-0/+12
| |
* | Merge remote-tracking branch 'origin/released'marha2011-12-141-12/+44
|\| | | | | | | | | | | | | | | | | Conflicts: mesalib/src/mapi/glapi/gen/EXT_gpu_shader4.xml mesalib/src/mapi/glapi/gen/glX_proto_recv.py mesalib/src/mapi/glapi/gen/glX_proto_size.py mesalib/src/mapi/glapi/gen/gl_gentable.py mesalib/src/mapi/glapi/gen/gl_table.py
| * git update pixman mesa 13 dec 2011marha2011-12-131-12/+44
| |
* | Merge remote-tracking branch 'origin/released'marha2011-11-251-1/+1
|\| | | | | | | | | | | | | | | | | | | 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-251-1/+1
| |
* | Merge remote-tracking branch 'origin/released'marha2011-11-141-1/+20
|\| | | | | | | | | Conflicts: libX11/src/util/makekeys.c
| * libX11 libXext libXinerama libXmu libfontenc libxcb mesa pixman git updatemarha2011-11-141-1/+20
| | | | | | | | 14 nov 2011
* | Merge remote-tracking branch 'origin/released'marha2011-11-0920-1000/+978
|\| | | | | | | | | Conflicts: mesalib/src/mapi/glapi/glapi.h
| * libX11 mesa pixman git update 9 nov 2011marha2011-11-0920-1000/+978
| |
* | Merge remote-tracking branch 'origin/released'marha2011-11-072-10/+6
|\| | | | | | | | | Conflicts: pixman/pixman/pixman-mmx.c
| * xserver pixman mesa git update 7 nov 2011marha2011-11-072-17/+17
| |
* | Merge remote-tracking branch 'origin/released'marha2011-11-044-5/+14
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mesalib/src/mesa/drivers/dri/swrast/swrast_priv.h xorg-server/hw/xwin/InitOutput.c xorg-server/hw/xwin/ddraw.h xorg-server/hw/xwin/winclipboardwndproc.c xorg-server/hw/xwin/winglobals.c xorg-server/hw/xwin/winmonitors.c xorg-server/hw/xwin/winprocarg.c xorg-server/hw/xwin/winwin32rootlesswndproc.c xorg-server/include/scrnintstr.h xorg-server/xkb/ddxList.c xorg-server/xkb/ddxLoad.c
| * xserver pixman mesa git update 4 nov 2011marha2011-11-044-5/+14
| |
* | Merge remote-tracking branch 'origin/released'marha2011-10-274-144/+124
|\|
| * libX11 libXft mesa mkfontscale pixman xserver git update 26 okt 2011marha2011-10-264-144/+124
| |
* | Merge remote-tracking branch 'origin/released'marha2011-10-194-165/+912
|\| | | | | | | | | Conflicts: xorg-server/include/os.h
| * libX11 libXext libXft mesa libxcb mkfontscale pixman xservermarha2011-10-194-165/+912
| | | | | | | | xkeyboard-config git update 19 oct 2011
* | Merge remote-tracking branch 'origin/released'marha2011-10-108-272/+788
|\|
| * fontconfig libX11 mesa pixman xkeyboard-config git updte 10 oct 2011marha2011-10-108-272/+788
| |
* | Merge remote-tracking branch 'origin/released'marha2011-10-051-1/+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-1/+0
| | | | | | | | update 5 oct 2011
* | Solved run-time error in debug due to type castmarha2011-09-301-1/+1
| |
* | Solved pixman compilaton problemmarha2011-09-283-47/+25
| |