aboutsummaryrefslogtreecommitdiff
path: root/fontconfig
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/released'marha2013-01-1116-16/+741
|\ | | | | | | | | | | | | | | | | | | | | * origin/released: fontconfig libX11 mesa mkfontscale xserver git update 11 jan 2013 Conflicts: mesalib/src/glsl/.gitignore mesalib/src/glsl/glcpp/.gitignore mesalib/src/mapi/glapi/gen/.gitignore mesalib/src/mesa/program/.gitignore
| * fontconfig libX11 mesa mkfontscale xserver git update 11 jan 2013marha2013-01-1116-16/+741
| | | | | | | | | | | | | | | | fontconfig: 0831c1770e4bac7269a190936bbb0529d747e233 libX11: 0b148750027fd0557c5ed93afda861ddf4b92e0f mkfontscale: 9cbe3256bc932b82f2435b23cda0931f4f5f5ba2 xserver: 6703a7c7cf1a349c137e247a0c8eb462ff7b07be mesa: babab2876080af0fe65249dff559244aebd0b87e
* | Use fonts.conf file in fontconfigmarha2013-01-082-1/+5
| |
* | Solved type cast errors in debugmarha2013-01-082-5/+5
| |
* | Merge remote-tracking branch 'origin/released'marha2013-01-0811-9/+210
|\| | | | | | | | | | | | | | | * origin/released: fontconfig mesa git update 8 jan 2013 Conflicts: fontconfig/src/fccache.c
| * fontconfig mesa git update 8 jan 2013marha2013-01-0811-9/+211
| | | | | | | | | | fontconfig: 4e6c7d0827c5b3b20205521bf9bd2e94e704b36d mesa: a60c567fcf29f5d2a41222a8826fee2cb0eb4458
* | Solved compile problems in fontconfig introduced by latest mergemarha2013-01-073-4/+24
| |
* | Merge remote-tracking branch 'origin/released'marha2013-01-0769-1603/+2262
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * origin/released: pixman xkbcomp libX11 libXau mesa fontconfig xserver xkeyboard-config git update 7 jan 2013 Conflicts: fontconfig/src/fcatomic.c pixman/pixman/pixman-mmx.c pixman/pixman/pixman-sse2.c xorg-server/dix/dispatch.c xorg-server/hw/xwin/wincursor.c xorg-server/hw/xwin/winmsg.c xorg-server/hw/xwin/winscrinit.c xorg-server/hw/xwin/winsetsp.c xorg-server/hw/xwin/winwin32rootless.c xorg-server/xfixes/cursor.c
| * pixman xkbcomp libX11 libXau mesa fontconfig xserver xkeyboard-config git ↵marha2013-01-0768-1592/+2261
| | | | | | | | | | | | | | | | | | | | | | | | | | update 7 jan 2013 fontconfig: 17eda89ed2e24a3fc5f68538dd7fd9ada8efb087 xserver: bd91b05b631f13afd1f7a9d6cbc4f0c5408b523a xkeyboard-config: 4779e2745094ebe0c06364b4099d7067ae750d07 libX11: cd25cab4b5b957641183ce72dd1ae0424aff1663 libXau: e04364efccbb3bb4cfc5f4cb491ffa1faaaacbdb mesa: afec10df373f342f058aab66c622237964a4a147 pixman: 35cc965514ca6e665c18411fcf66db826d559c2a xkbcomp: e4f767913338052527538d429931e8abd8c3fb88
* | Merge remote-tracking branch 'origin/released'marha2012-12-125-10/+7
|\| | | | | | | | | * origin/released: fontconfig mesa pixman xkeyboard-config git update 12 dev 2012
| * fontconfig mesa pixman xkeyboard-config git update 12 dev 2012marha2012-12-125-10/+7
| | | | | | | | | | | | | | fontconfig: 9ce36f4bbebc702a35d0cd9f1a59d5b828549bc6 mesa: 621259b3de1f15c879620bbf17764fd8a27ae6f5 pixman: fdab3c1b6cd9c5e197ec3f6bc0a03da32880e317 xkeyboard-config: 378597a9d525f069c049fdd6d04ff628123f82c7
* | Merge remote-tracking branch 'origin/released'marha2012-12-109-27/+82
|\| | | | | | | | | | | | | | | * 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-109-27/+82
| | | | | | | | | | | | | | libX11 9833489e6c3829a1e835bc0a11f028fc180809e4 mesa 17f5dc57306b8f5079304701e455bf4b927d3cae pixman 8ca4e144724ba2041bc5ef077ccf6d24e7cf4d1f fontconfig 608c5b590bd3428dfcd30f3d68ee8b7131e2f019
* | Merge remote-tracking branch 'origin/released'marha2012-12-034-15/+19
|\| | | | | | | | | * 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-034-15/+19
| | | | | | | | | | | | | | | | fontconfig: 2442d611579bccb84f0c29e3f9ceb0a7436df812 mesa: 54ff536823bf5a431efe1f2becdb21174c146948 xserver: b51a1bd2766e7dc975ca8f1cacc3f8bd0e1a68a3 pixman: 978bab253d1d061b00b5e80aa45ab6986aac466f xkeyboard-config: 05dcc6db64cd7425aea6d22efd6a3ecf34dbddd2
* | Added missing filemarha2012-11-291-0/+2
| |
* | Merge remote-tracking branch 'origin/released'marha2012-11-299-15/+736
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * origin/released: fontconfig xserver mesa git update 29 nov 2012 Conflicts: xorg-server/dix/dispatch.c xorg-server/hw/xwin/InitOutput.c xorg-server/hw/xwin/ddraw.h xorg-server/hw/xwin/glx/indirect.c xorg-server/hw/xwin/winclipboardthread.c xorg-server/hw/xwin/winclipboardxevents.c xorg-server/hw/xwin/winengine.c xorg-server/hw/xwin/winerror.c xorg-server/hw/xwin/winglobals.c xorg-server/hw/xwin/winkeybd.c xorg-server/hw/xwin/winmultiwindowwm.c xorg-server/hw/xwin/winmultiwindowwndproc.c xorg-server/hw/xwin/winprocarg.c xorg-server/hw/xwin/winwin32rootless.c xorg-server/hw/xwin/winwindow.h xorg-server/os/osinit.c xorg-server/os/utils.c
| * fontconfig xserver mesa git update 29 nov 2012marha2012-11-299-15/+736
| | | | | | | | | | | | xserver: 1712a45422a63f11b2146541279616fcfda09ec6 fontconfig: faea1cac85ac3b0fd6a983e1c0adeb68e115e06c mesa: c1023608002c985b9d72edc64732cd666de2a206
* | Merge remote-tracking branch 'origin/released'marha2012-11-212-5/+5
|\| | | | | | | | | * origin/released: Git update 21 nov 2012
| * Git update 21 nov 2012marha2012-11-212-5/+5
| | | | | | | | | | | | fontconfig: 376fc9d22f1480ac380a3845f4cb4fe227e4be9a mesa: d82b873a501606d62b9f208b6d5cda79c9a6b4b8 xkeyboard-config: 0be23e0774bebdaa9766ddd7a1f3cf088d079bf0
* | Merge remote-tracking branch 'origin/released'marha2012-11-193-21/+210
|\| | | | | | | | | | | | | | | | | | | | | | | | | * 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-193-21/+210
| | | | | | | | | | | | | | | | | | fontconfig: c20ac78b01df3f0919352bba16b5b48b3b5d4d6d libxcb: 76a2166de9c80b35f987fdc3f3a228bafa0de94e mesa: ddb901fbf4489ffcd85d3320f23913eb1d4fbdfe pixman: 44dd746bb68625b2f6be77c3f80292b45defe9d7 xserver: 6a6c3afe71ac82a93d9fd0034dd5bbdcf0eae1ea xkeyboard-config: 709e05c069428236ca2567e784c9971eecc8ca50
* | Merge remote-tracking branch 'origin/released'marha2012-10-301-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * origin/released: fontconfig xserver mesa git update 30 oct 2012 Conflicts: xorg-server/dix/grabs.c xorg-server/hw/xwin/winclipboard.h xorg-server/hw/xwin/winclipboardthread.c xorg-server/hw/xwin/winclipboardwrappers.c xorg-server/hw/xwin/winmonitors.c xorg-server/hw/xwin/winmsg.c xorg-server/hw/xwin/winmsg.h xorg-server/hw/xwin/winprefslex.l xorg-server/hw/xwin/winprefsyacc.y xorg-server/hw/xwin/winregistry.c
| * fontconfig xserver mesa git update 30 oct 2012marha2012-10-301-0/+0
| | | | | | | | | | | | fontconfig: bdaef0b80dc27f4ab7a9d9bcedcfd8b5724b3cfd xserver: 1ca096d5e07221025c4c4110528772b7d94f15ee mesa: 0a66ced8f822b0d5478b0cd6d72c1a6ad70647a2
* | Merge remote-tracking branch 'origin/released'marha2012-10-267-28/+21
|\| | | | | | | | | * origin/released: fontconfig pixman mesa git update 26 oct 2012
| * fontconfig pixman mesa git update 26 oct 2012marha2012-10-267-28/+21
| | | | | | | | | | | | fontconfig: 038aa930ae2c3b7972eefe334917e7222fe478ec mesa: 8fb4b1dce156d02a0907925364d8945915c29bcf pixman: 4b91f6ca72db3e8cbd7e97e9ef44be2f8994040d
* | Merge remote-tracking branch 'origin/released'marha2012-10-251-0/+1
|\| | | | | | | | | * origin/released: fontconfig mesa pixman git update
| * fontconfig mesa pixman git updatemarha2012-10-251-0/+1
| | | | | | | | | | | | fonconfig: 73ab254336100c5971e3a1e14b73222efd0e9822 mesa: 86cd77d0a9ac940c2c06eebc5e9ef840d176712a pixman: 9df645dfb04b5a790faabe1e9a84fc37287d91b0
* | Merge remote-tracking branch 'origin/released'marha2012-10-092-5/+9
|\| | | | | | | | | * origin/released: fontconfig xserver mesa xkeyboard-config git update 9 oct 2012
| * fontconfig xserver mesa xkeyboard-config git update 9 oct 2012marha2012-10-092-5/+9
| | | | | | | | | | | | | | fontconfig: e7bfe729ab4cae63ca502291c1fe46cf7152b459 mesa: 63c3a799aecff5348ecec3c4c13355996e4bf820 xserver: 0a75bd640b3dc26b89d9e342999a7f4b7e98edbf xkeyboard-config: 2e9ab8be72b1d0306e5e6e8c33cde51c0c927450
* | Merge remote-tracking branch 'origin/released'marha2012-09-141-1/+17
|\|
| * fontconfig libX11 mesa xkeyboard-config git update 14 sep 2012marha2012-09-141-1/+17
| |
| * randrproto xwininfo fontconfig libxcb mesa xkeyboard-config pixman xservermarha2012-08-311-2/+2
| | | | | | | | git update 31 Aug 2012
| * fontconfig mesa xserver git update 28 Aug 2012marha2012-08-283-4/+2
| |
| * xwininfo fontconfig libX11 libXau libXext libxcb mesa pixmanmarha2012-08-271-2/+1
| | | | | | | | xkeyboard-config git update 27 Aug 2012
* | randrproto xwininfo fontconfig libxcb mesa xkeyboard-config pixman xservermarha2012-09-041-2/+2
| | | | | | | | git update 31 Aug 2012
* | fontconfig mesa xserver git update 28 Aug 2012marha2012-09-043-4/+2
| |
* | xwininfo fontconfig libX11 libXau libXext libxcb mesa pixmanmarha2012-09-041-2/+1
| | | | | | | | xkeyboard-config git update 27 Aug 2012
* | Merge remote-tracking branch 'origin/released'marha2012-08-171-2/+2
|\|
| * fontconfig mesa git update 17 Aug 2012marha2012-08-171-2/+2
| |
* | Merge remote-tracking branch 'origin/released'marha2012-07-315-5/+11
|\|
| * fontconfig libXext mesa xserver pixman git update 31 Jul 2012marha2012-07-315-5/+11
| |
* | Merge remote-tracking branch 'origin/released'marha2012-07-184-6/+15
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mesalib/src/glsl/.gitignore xorg-server/Xext/panoramiX.c xorg-server/hw/xwin/win.h xorg-server/hw/xwin/winclipboardinit.c xorg-server/hw/xwin/winclipboardthread.c xorg-server/hw/xwin/winclipboardunicode.c xorg-server/hw/xwin/winclipboardwrappers.c xorg-server/hw/xwin/winclipboardxevents.c xorg-server/hw/xwin/wincreatewnd.c xorg-server/hw/xwin/windialogs.c xorg-server/hw/xwin/winerror.c xorg-server/hw/xwin/winmonitors.c xorg-server/hw/xwin/winmultiwindowwm.c xorg-server/hw/xwin/winprocarg.c xorg-server/hw/xwin/winwndproc.c
| * fontconfig mesa xserver git update 18 Jul 2012marha2012-07-184-6/+15
| |
* | Merge remote-tracking branch 'origin/released'marha2012-07-113-2/+5
|\| | | | | | | | | | | | | | | | | | | | | Conflicts: xorg-server/Xext/shm.c xorg-server/Xext/sync.c xorg-server/Xext/xf86bigfont.c xorg-server/Xi/opendev.c xorg-server/dix/dispatch.c xorg-server/include/globals.h xorg-server/mi/miinitext.c
| * fontconfig mesa xserver git update 10 Jul 2012marha2012-07-102-1/+3
| |
* | Merge remote-tracking branch 'origin/released'marha2012-07-091-4/+17
|\| | | | | | | | | | | Conflicts: xorg-server/dix/dispatch.c xorg-server/include/misc.h
| * fontconfig libX11 mesa pixman xserver git update 9 Jul 2012marha2012-07-091-4/+17
| |
* | Merge remote-tracking branch 'origin/released'marha2012-07-061-0/+12
|\| | | | | | | | | | | | | | | Conflicts: xorg-server/dix/dispatch.c xorg-server/dix/privates.c xorg-server/hw/kdrive/ephyr/ephyr.c xorg-server/hw/kdrive/src/kinput.c
| * randrproto fontconfig mesa xserver git update 6 Jul 2012marha2012-07-061-0/+12
| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-17 03:33:04 +0000