aboutsummaryrefslogtreecommitdiff
path: root/fontconfig/src
Commit message (Collapse)AuthorAgeFilesLines
* Use fonts.conf file in fontconfigmarha2013-01-081-1/+1
|
* Solved type cast errors in debugmarha2013-01-082-5/+5
|
* Merge remote-tracking branch 'origin/released'marha2013-01-087-7/+121
|\ | | | | | | | | | | | | | | * origin/released: fontconfig mesa git update 8 jan 2013 Conflicts: fontconfig/src/fccache.c
| * fontconfig mesa git update 8 jan 2013marha2013-01-087-7/+122
| | | | | | | | | | fontconfig: 4e6c7d0827c5b3b20205521bf9bd2e94e704b36d mesa: a60c567fcf29f5d2a41222a8826fee2cb0eb4458
* | Solved compile problems in fontconfig introduced by latest mergemarha2013-01-072-3/+21
| |
* | Merge remote-tracking branch 'origin/released'marha2013-01-0733-1269/+1412
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-0732-1258/+1411
| | | | | | | | | | | | | | | | | | | | | | | | | | 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-124-3/+7
|\| | | | | | | | | * origin/released: fontconfig mesa pixman xkeyboard-config git update 12 dev 2012
| * fontconfig mesa pixman xkeyboard-config git update 12 dev 2012marha2012-12-124-3/+7
| | | | | | | | | | | | | | fontconfig: 9ce36f4bbebc702a35d0cd9f1a59d5b828549bc6 mesa: 621259b3de1f15c879620bbf17764fd8a27ae6f5 pixman: fdab3c1b6cd9c5e197ec3f6bc0a03da32880e317 xkeyboard-config: 378597a9d525f069c049fdd6d04ff628123f82c7
* | Merge remote-tracking branch 'origin/released'marha2012-12-107-25/+75
|\| | | | | | | | | | | | | | | * 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-107-25/+75
| | | | | | | | | | | | | | libX11 9833489e6c3829a1e835bc0a11f028fc180809e4 mesa 17f5dc57306b8f5079304701e455bf4b927d3cae pixman 8ca4e144724ba2041bc5ef077ccf6d24e7cf4d1f fontconfig 608c5b590bd3428dfcd30f3d68ee8b7131e2f019
* | Added missing filemarha2012-11-291-0/+2
| |
* | Merge remote-tracking branch 'origin/released'marha2012-11-292-9/+11
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-292-9/+11
| | | | | | | | | | | | xserver: 1712a45422a63f11b2146541279616fcfda09ec6 fontconfig: faea1cac85ac3b0fd6a983e1c0adeb68e115e06c mesa: c1023608002c985b9d72edc64732cd666de2a206
* | 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-091-0/+4
|\| | | | | | | | | * origin/released: fontconfig xserver mesa xkeyboard-config git update 9 oct 2012
| * fontconfig xserver mesa xkeyboard-config git update 9 oct 2012marha2012-10-091-0/+4
| | | | | | | | | | | | | | fontconfig: e7bfe729ab4cae63ca502291c1fe46cf7152b459 mesa: 63c3a799aecff5348ecec3c4c13355996e4bf820 xserver: 0a75bd640b3dc26b89d9e342999a7f4b7e98edbf xkeyboard-config: 2e9ab8be72b1d0306e5e6e8c33cde51c0c927450
| * randrproto xwininfo fontconfig libxcb mesa xkeyboard-config pixman xservermarha2012-08-311-2/+2
| | | | | | | | git update 31 Aug 2012
* | randrproto xwininfo fontconfig libxcb mesa xkeyboard-config pixman xservermarha2012-09-041-2/+2
| | | | | | | | git update 31 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-111-1/+1
|\| | | | | | | | | | | | | | | | | | | | | 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-101-1/+1
| |
* | Merge remote-tracking branch 'origin/released'marha2012-06-221-3/+13
|\| | | | | | | | | Conflicts: mesalib/src/mapi/glapi/gen/.gitignore
| * mesa xserver libxcb fontconfigmarha2012-06-221-3/+13
| |
* | Merge remote-tracking branch 'origin/released'marha2012-06-181-2/+12
|\|
| * fontconfig mesa pixman git update 18 Jun 2012marha2012-06-181-2/+12
| |
* | Solved compilation error in fontconfigmarha2012-06-151-3/+0
| |
* | Merge remote-tracking branch 'origin/released'marha2012-06-157-34/+41
|\| | | | | | | | | | | | | | | 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-157-34/+43
| |
* | Merge remote-tracking branch 'origin/released'marha2012-06-124-6/+7
|\|
| * fontconfig mesa pixman git update 12 Juni 2012marha2012-06-124-9/+10
| |
* | Merge remote-tracking branch 'origin/released'marha2012-06-116-74/+273
|\| | | | | | | | | Conflicts: mesalib/src/glsl/glcpp/.gitignore
| * fontconfig glproto mesa pixman git update 11 Jun 2012marha2012-06-116-74/+273
| |
* | Merge remote-tracking branch 'origin/released'marha2012-06-046-19/+70
|\|
| * fontconfig libX11 libXft mesa pixman xserver xkeyboard-config git update 4marha2012-06-046-19/+70
| | | | | | | | May 2012
* | fontconfig: solved compile warnings and link errors.marha2012-05-293-2/+4
| |
* | Merge remote-tracking branch 'origin/released'marha2012-05-296-150/+349
|\| | | | | | | | | | | Conflicts: pixman/pixman/pixman-mmx.c xorg-server/Xext/hashtable.c
| * fontconfig libX11 mesa pixman xserver git update 29 May 2012marha2012-05-296-150/+349
| |
* | Merge remote-tracking branch 'origin/released'marha2012-05-251-0/+5
|\|
| * fontconfig xserver xkeyboard-config pixman git update 2012marha2012-05-251-0/+5
| |
* | Solved compilation errorsmarha2012-05-251-3/+6
| |
* | Merge remote-tracking branch 'origin/released'marha2012-05-215-129/+329
|\|
| * fontconfig mesa xkeyboard-config xserver pixman git update 21 Mar 2012marha2012-05-215-129/+329
| |
* | Merge remote-tracking branch 'origin/released'marha2012-05-155-27/+69
|\|
| * fontconfig libX11 mesa xkeyboard-config pixman git update 14 May 2012marha2012-05-145-27/+69
| |
* | Merge remote-tracking branch 'origin/released'marha2012-05-101-2/+0
|\| | | | | | | | | Conflicts: xorg-server/os/log.c
| * xserver fontconfig mesa git update 10 May 2012marha2012-05-101-2/+0
| |
* | Merge remote-tracking branch 'origin/released'marha2012-05-024-26/+67
|\| | | | | | | | | Conflicts: xorg-server/os/connection.c
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-08 03:31:19 +0000