aboutsummaryrefslogtreecommitdiff
path: root/pixman
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/released'marha2012-12-1036-389/+2618
|\ | | | | | | | | | | | | | | * origin/released: fontconfig libX11 mesa pixman git update 10 dec 2012 Conflicts: fontconfig/src/fcxml.c
| * fontconfig libX11 mesa pixman git update 10 dec 2012marha2012-12-1036-389/+2618
| | | | | | | | | | | | | | libX11 9833489e6c3829a1e835bc0a11f028fc180809e4 mesa 17f5dc57306b8f5079304701e455bf4b927d3cae pixman 8ca4e144724ba2041bc5ef077ccf6d24e7cf4d1f fontconfig 608c5b590bd3428dfcd30f3d68ee8b7131e2f019
* | Merge remote-tracking branch 'origin/released'marha2012-12-036-16/+150
|\| | | | | | | | | * origin/released: fontconfig mesa xserver pixman xkeyboard-config git update 3 dec 2012
| * fontconfig mesa xserver pixman xkeyboard-config git update 3 dec 2012marha2012-12-036-16/+150
| | | | | | | | | | | | | | | | fontconfig: 2442d611579bccb84f0c29e3f9ceb0a7436df812 mesa: 54ff536823bf5a431efe1f2becdb21174c146948 xserver: b51a1bd2766e7dc975ca8f1cacc3f8bd0e1a68a3 pixman: 978bab253d1d061b00b5e80aa45ab6986aac466f xkeyboard-config: 05dcc6db64cd7425aea6d22efd6a3ecf34dbddd2
* | Merge remote-tracking branch 'origin/released'marha2012-11-1913-107/+650
|\| | | | | | | | | | | | | | | | | | | | | | | | | * origin/released: git update 19 nov 2012 Added bash script to update released branch Conflicts: mesalib/src/mapi/glapi/gen/gl_API.xml mesalib/src/mesa/program/.gitignore pixman/pixman/pixman-mmx.c xorg-server/Xi/xiquerypointer.c xorg-server/xkb/xkb.c
| * git update 19 nov 2012marha2012-11-1913-107/+650
| | | | | | | | | | | | | | | | | | fontconfig: c20ac78b01df3f0919352bba16b5b48b3b5d4d6d libxcb: 76a2166de9c80b35f987fdc3f3a228bafa0de94e mesa: ddb901fbf4489ffcd85d3320f23913eb1d4fbdfe pixman: 44dd746bb68625b2f6be77c3f80292b45defe9d7 xserver: 6a6c3afe71ac82a93d9fd0034dd5bbdcf0eae1ea xkeyboard-config: 709e05c069428236ca2567e784c9971eecc8ca50
* | Merge remote-tracking branch 'origin/released'marha2012-11-1916-1923/+1923
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * origin/released: Changed file permissions dos -> unix Conflicts: libX11/include/X11/Xregion.h libX11/src/ConvSel.c libX11/src/CrGlCur.c libX11/src/CrWindow.c libX11/src/GetDflt.c libX11/src/StrKeysym.c libX11/src/Window.c libX11/src/xkb/XKBBind.c libX11/src/xkb/XKBGetMap.c libX11/src/xkb/XKBSetGeom.c libX11/src/xkb/XKBUse.c libX11/src/xlibi18n/XimProto.h libX11/src/xlibi18n/lcDynamic.c libXdmcp/Key.c libXdmcp/Write.c libxcb/src/xcb_windefs.h xkbcomp/keycodes.c xkbcomp/xkbpath.c xorg-server/hw/xwin/glx/winpriv.h xorg-server/xkeyboard-config/rules/bin/ml1_s.sh xorg-server/xkeyboard-config/rules/bin/ml1v1_s.sh xorg-server/xkeyboard-config/rules/bin/ml1v_s.sh xorg-server/xkeyboard-config/rules/bin/ml_s.sh xorg-server/xkeyboard-config/rules/bin/mln_s.sh xorg-server/xkeyboard-config/rules/bin/mlnvn_s.sh xorg-server/xkeyboard-config/rules/bin/mlv_s.sh xorg-server/xkeyboard-config/rules/compat/.gitignore
| * dos -> unixmarha2012-11-1916-1923/+1923
| |
* | Merge remote-tracking branch 'origin/released'marha2012-11-091-2/+2
|\| | | | | | | | | * origin/released: mesa git update 9 nov 2012
| * mesa git update 9 nov 2012marha2012-11-091-2/+2
| | | | | | | | mesa: 011f8458805e443ac9130865d2840a929a00cabf
* | Merge remote-tracking branch 'origin/released'marha2012-10-264-1/+679
|\| | | | | | | | | * origin/released: fontconfig pixman mesa git update 26 oct 2012
| * fontconfig pixman mesa git update 26 oct 2012marha2012-10-264-1/+679
| | | | | | | | | | | | fontconfig: 038aa930ae2c3b7972eefe334917e7222fe478ec mesa: 8fb4b1dce156d02a0907925364d8945915c29bcf pixman: 4b91f6ca72db3e8cbd7e97e9ef44be2f8994040d
* | Merge remote-tracking branch 'origin/released'marha2012-10-251-0/+7
|\| | | | | | | | | * origin/released: fontconfig mesa pixman git update
| * fontconfig mesa pixman git updatemarha2012-10-251-0/+7
| | | | | | | | | | | | fonconfig: 73ab254336100c5971e3a1e14b73222efd0e9822 mesa: 86cd77d0a9ac940c2c06eebc5e9ef840d176712a pixman: 9df645dfb04b5a790faabe1e9a84fc37287d91b0
* | Merge remote-tracking branch 'origin/released'marha2012-10-227-61/+143
|\| | | | | | | | | * origin/released: libX11 mesa pixman git update 22 oct 2012
| * libX11 mesa pixman git update 22 oct 2012marha2012-10-227-61/+143
| | | | | | | | | | | | libX11: f2a8def423a46d52e834cf7ea49fa0079427663a mesa: 259fc154f1fdcabbc0a6c02c524962b063f9dee6 pixman: 31e5a0a393defb8e0534ab1bde29ab23fc04795d
* | Merge remote-tracking branch 'origin/released'marha2012-10-172-4/+14
|\| | | | | | | | | * origin/released: pixman mesa git update 17 oct 2012
| * pixman mesa git update 17 oct 2012marha2012-10-172-4/+14
| | | | | | | | | | pixman: 6e56098c0338ce74228187e4c96fed1a66cb0956 mesa: 0199ff7fe323cf527ffacfdef3258ab85799dd13
* | Merge remote-tracking branch 'origin/released'marha2012-10-152-40/+16
|\| | | | | | | | | | | | | | | * origin/released: xserver mesa pixman git update 15 oct 2012 Conflicts: xorg-server/hw/xwin/InitOutput.c
| * xserver mesa pixman git update 15 oct 2012marha2012-10-152-40/+16
| | | | | | | | | | | | xserver: a69429a17bf4630f6e26f61630a1c2b287202627 pixman: d5f2f39319fc358cccda60abe0bc927bd27131c1 mesa: 4004620d34a580c8fdb965d9b640e97453fc8b28
* | 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
| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-14 21:08:41 +0000