aboutsummaryrefslogtreecommitdiff
path: root/pixman
Commit message (Collapse)AuthorAgeFilesLines
* Synchronised with Makefile.sourcesmarha2012-10-081-22/+1
|
* Merge remote-tracking branch 'origin/released'marha2012-10-0829-1416/+2573
|\ | | | | | | | | | | | | | | | | | | | | * origin/released: pixman libxcb mesa xserver xkeyboard-config git update 8 oct 2012 Conflicts: xorg-server/Xext/xf86bigfont.c xorg-server/dix/dispatch.c xorg-server/include/dixstruct.h xorg-server/os/connection.c
| * pixman libxcb mesa xserver xkeyboard-config git update 8 oct 2012marha2012-10-0829-1416/+2573
| | | | | | | | | | | | | | | | xserver: 09f1e5b15b769e1122f0a8d7cae0820038992312 libxcb: 4ffe54f69049e6792a35a287fd9ff83abbd4fd8d mesa: 86de501f14f11f1e993c8703c0d69bdf1f6c7835 xkeyboard-config: 0a21bb5a28018902a6252fccb620d7dff7e67175 pixman: 3d81d89c292058522cce91338028d9b4c4a23c24
* | Merge remote-tracking branch 'origin/released'marha2012-10-048-33/+33
|\| | | | | | | | | * origin/released: randrproto mesa pixman git update 4 oct 2012
| * randrproto mesa pixman git update 4 oct 2012marha2012-10-048-33/+33
| | | | | | | | | | | | randrproto: 4fcbd8584e55ff789522a38a41a33c34446d1455 mesa: 185d6df3c10a7ff5defe163af614bfc41088910b pixman: 2e17b6dd4ee7c32684fb7ffc70d3ad3ebf7cb2ef
* | Merge remote-tracking branch 'origin/released'marha2012-10-012-2/+4
|\| | | | | | | | | | | | | | | * origin/released: libxcb mesa pixman xkeyboard-config git update 1 oct 2012 Conflicts: libxcb/src/man/.gitignore
| * libxcb mesa pixman xkeyboard-config git update 1 oct 2012marha2012-10-012-2/+4
| | | | | | | | | | | | | | libxcb: 23911a707b8845bff52cd7853fc5d59fb0823cef mesa: c321b1bef15e2807de3f6225c4abcbf48969997a pixman: 183afcf1d95625a1f237ef349a1c8931d94d000d xkeyboard-config: 159e8db2a3829a11801d06cc6cad6d1378551dd5
* | Merge remote-tracking branch 'origin/released'marha2012-09-2716-127/+947
|\| | | | | | | | | * origin/released: mesa xserver pixman xkeyboard-config git update 27 sep 2012
| * mesa xserver pixman xkeyboard-config git update 27 sep 2012marha2012-09-2716-127/+947
| | | | | | | | | | | | | | xserver 0b02150c27e98f996e10d7489f9f67a30e4e3497 pixman aff796d6cee4cb81f0352c2f7d0c994229bd5ca1 xkeyboard-config 33ccc8f4b3f1c6ae95242cf9cb19e8df87f6f37e mesa 6d6aef79742ece3bb570ae44e6c13791aae15e01
* | Merge remote-tracking branch 'origin/released'marha2012-09-2413-593/+388
|\| | | | | | | | | | | | | | | | | * origin/released: mesa pixman xserver git update 24 sep 2012 Conflicts: pixman/pixman/pixman-sse2.c xorg-server/dix/window.c
| * mesa pixman xserver git update 24 sep 2012marha2012-09-2413-593/+388
| | | | | | | | | | | | xserver: 7722bcbab2507d263c7685b15cccbfdd52fc3a24 pixman: c4b69e706e63e01fbc70e0026c2079007c89de14 mesa: c432c86e6aeebeb46c028af940224c59faa16e88
* | Merge remote-tracking branch 'origin/released'marha2012-09-203-31/+16
|\| | | | | | | | | | | | | | | * origin/released: libxcb xserver pixman mesa git update 20 sep 2012 Conflicts: libxcb/src/xcb_conn.c
| * libxcb xserver pixman mesa git update 20 sep 2012marha2012-09-203-31/+16
| | | | | | | | | | | | | | libxcb: 08cc068ead7b8e678cdb119b38ada5261d5cc3ea xserver: 70e5766874a919039678bb2ed75f2ccea0cb4345 pixman: 3124a51abb89475b8c5045bc96e04c5852694a16 mesa: bd8fb9e80562fbe0ff76cae50fc411635096f3a9
* | Merge remote-tracking branch 'origin/released'marha2012-09-175-14/+21
|\| | | | | | | | | | | Conflicts: mesalib/src/mesa/main/syncobj.h pixman/pixman/pixman-mmx.c
| * mesa xserver pixman git update 17 sep 2012marha2012-09-175-23/+32
| |
| * randrproto xwininfo fontconfig libxcb mesa xkeyboard-config pixman xservermarha2012-08-311-17/+15
| | | | | | | | git update 31 Aug 2012
| * xwininfo fontconfig libX11 libXau libXext libxcb mesa pixmanmarha2012-08-271-271/+0
| | | | | | | | xkeyboard-config git update 27 Aug 2012
* | randrproto xwininfo fontconfig libxcb mesa xkeyboard-config pixman xservermarha2012-09-041-17/+15
| | | | | | | | git update 31 Aug 2012
* | xwininfo fontconfig libX11 libXau libXext libxcb mesa pixmanmarha2012-09-041-271/+0
| | | | | | | | xkeyboard-config git update 27 Aug 2012
* | Merge remote-tracking branch 'origin/released'marha2012-08-211-4/+0
|\|
| * xserver xkeyboard-config mesa pixman git update 21 Aug 2012marha2012-08-211-4/+0
| |
* | Merge remote-tracking branch 'origin/released'marha2012-08-137-26/+163
|\|
| * mesa pixman xkeyboard-config xserver git update 13 Aug 2012marha2012-08-137-26/+163
| |
* | Merge remote-tracking branch 'origin/released'marha2012-08-036-5/+14
|\|
| * pixman mesa git update 3 Aug 2012marha2012-08-036-5/+14
| |
* | Solved compile errorsmarha2012-08-011-0/+4
| |
* | Merge remote-tracking branch 'origin/released'marha2012-07-3114-19/+476
|\|
| * fontconfig libXext mesa xserver pixman git update 31 Jul 2012marha2012-07-3114-19/+476
| |
* | Merge remote-tracking branch 'origin/released'marha2012-07-112-193/+157
|\| | | | | | | | | Conflicts: xorg-server/dix/devices.c
| * mesa xserver pixman git update 11 Jul 2012marha2012-07-112-193/+157
| |
* | synchronised pixman/pixman/makefile pixman/pixman/makefile.sourcesmarha2012-07-091-1/+4
| |
* | Merge remote-tracking branch 'origin/released'marha2012-07-0917-845/+1724
|\| | | | | | | | | | | Conflicts: xorg-server/dix/dispatch.c xorg-server/include/misc.h
| * fontconfig libX11 mesa pixman xserver git update 9 Jul 2012marha2012-07-0917-845/+1724
| |
* | Solved compilation warnings introduced in latest mergemarha2012-07-021-0/+1
| |
* | Solved compilation errors due to latest mergemarha2012-07-021-12/+15
| |
* | Merge remote-tracking branch 'origin/released'marha2012-07-0212-183/+645
|\| | | | | | | | | Conflicts: pixman/pixman/pixman-sse2.c
| * mesa pixman xserver git update 2 Jul 2012marha2012-07-0212-183/+645
| |
* | Merge remote-tracking branch 'origin/released'marha2012-06-293-12/+72
|\| | | | | | | | | | | Conflicts: xorg-server/hw/xwin/glx/gen_gl_wrappers.py xorg-server/hw/xwin/glx/indirect.c
| * xkeyboard-config xserver pixman mesa git update 29 Jun 2012marha2012-06-293-12/+72
| |
* | Merge remote-tracking branch 'origin/released'marha2012-06-211-1/+5
|\|
| * mesa pixman xkeyboard-config xserver git update 21 Jun 2012marha2012-06-211-1/+5
| |
* | Merge remote-tracking branch 'origin/released'marha2012-06-182-0/+85
|\|
| * fontconfig mesa pixman git update 18 Jun 2012marha2012-06-182-0/+85
| |
* | Merge remote-tracking branch 'origin/released'marha2012-06-151-0/+1
|\| | | | | | | | | | | | | | | Conflicts: fontconfig/src/fcint.h fontconfig/src/fcstat.c mesalib/src/mapi/glapi/gen/GL3x.xml xorg-server/glx/glxext.h
| * fontconfig mesa pixman xserver git update 15 juni 2012marha2012-06-151-0/+1
| |
* | Merge remote-tracking branch 'origin/released'marha2012-06-126-117/+136
|\|
| * fontconfig mesa pixman git update 12 Juni 2012marha2012-06-126-117/+136
| |
* | Synchronised makefile with Makefile.sourcesmarha2012-06-111-27/+34
| |
* | Merge remote-tracking branch 'origin/released'marha2012-06-1115-79/+1344
|\| | | | | | | | | Conflicts: mesalib/src/glsl/glcpp/.gitignore
| * fontconfig glproto mesa pixman git update 11 Jun 2012marha2012-06-1115-79/+1344
| |