aboutsummaryrefslogtreecommitdiff
path: root/fontconfig/src
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * fontconfig mesa xserver xkeyboard-config git update 2 May 2012marha2012-05-024-26/+67
| |
* | Merge remote-tracking branch 'origin/released'marha2012-04-306-29/+249
|\| | | | | | | | | | | Conflicts: pixman/pixman/pixman-mmx.c xorg-server/glx/glapi_gentable.c
| * fontconfig libX11 libfontenc mesa pixman xserver git update 30 Apr 2012marha2012-04-306-29/+249
| |
* | Merge remote-tracking branch 'origin/released'marha2012-04-234-2/+90
|\|
| * fontconfig libXau libXext libxcb pixman mesa git update 23 April 2012marha2012-04-234-2/+90
| |
* | Merge remote-tracking branch 'origin/released'marha2012-04-202-0/+93
|\| | | | | | | | | | | Conflicts: xorg-server/dix/dispatch.c xorg-server/dix/resource.c
| * fontconfig libX11 mesa pixman xserver git update 20 april 2012marha2012-04-202-0/+93
| |
* | solved compiler warningmarha2012-04-201-0/+2
| |
* | Merge remote-tracking branch 'origin/released'marha2012-04-171-0/+3
|\|
| * fontconfig mesa git update 17 Apr 2012marha2012-04-171-0/+3
| |
* | Merge remote-tracking branch 'origin/released'marha2012-04-135-39/+164
|\|
| * fontconfig xserver xkeyboard-config mesa git update 13 Apr 2012marha2012-04-136-46/+164
| |
* | Merge remote-tracking branch 'origin/released'marha2012-04-102-7/+22
|\| | | | | | | | | Conflicts: xorg-server/os/log.c
| * fontconfig mesa xkeyboard-config xserver pixman git update 10 Apr 2012marha2012-04-102-7/+22
| |
* | Merge remote-tracking branch 'origin/released'marha2012-03-301-1/+1
|\|
| * fontconfig git update 30 mar 2012marha2012-03-301-1/+1
| |
* | Merge remote-tracking branch 'origin/released'marha2012-03-291-13/+0
|\|
| * xserver fontconfig mesa git update 29 Mar 2012marha2012-03-291-13/+0
| |
* | Merge remote-tracking branch 'origin/released'marha2012-03-287-78/+55
|\|
| * xkeyboard-config pixman fontconfig mesa git update 28 Mar 2012marha2012-03-287-78/+55
| |
* | Merge remote-tracking branch 'origin/released'marha2012-03-281-0/+3
|\|
| * fontconfig libxcb xcb-proto mesa xserver git update 27 Mar 2012marha2012-03-271-0/+3
| |
* | Merge remote-tracking branch 'origin/released'marha2012-03-264-14/+42
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: pixman/pixman/pixman-mmx.c xorg-server/Xext/shm.c xorg-server/Xext/syncsrv.h xorg-server/Xext/xvmain.c xorg-server/Xi/exevents.c xorg-server/Xi/opendev.c xorg-server/composite/compalloc.c xorg-server/composite/compoverlay.c xorg-server/dix/colormap.c xorg-server/dix/devices.c xorg-server/dix/dispatch.c xorg-server/dix/dixfonts.c xorg-server/dix/eventconvert.c xorg-server/dix/events.c xorg-server/dix/gc.c xorg-server/dix/getevents.c xorg-server/dix/main.c xorg-server/dix/privates.c xorg-server/dix/registry.c xorg-server/dix/resource.c xorg-server/exa/exa_accel.c xorg-server/exa/exa_migration_classic.c xorg-server/exa/exa_unaccel.c xorg-server/fb/fb.h xorg-server/fb/fbcopy.c xorg-server/fb/fbpixmap.c xorg-server/glx/dispatch.h xorg-server/glx/glapi.h xorg-server/glx/glapi_gentable.c xorg-server/glx/glapitable.h xorg-server/glx/glprocs.h xorg-server/glx/glxcmds.c xorg-server/glx/glxcmdsswap.c xorg-server/glx/glxdricommon.c xorg-server/glx/glxdriswrast.c xorg-server/glx/glxext.c xorg-server/glx/indirect_dispatch.c xorg-server/glx/indirect_dispatch.h xorg-server/glx/indirect_dispatch_swap.c xorg-server/glx/indirect_size.h xorg-server/glx/indirect_size_get.h xorg-server/glx/indirect_table.c xorg-server/glx/indirect_util.c xorg-server/glx/rensize.c xorg-server/glx/single2swap.c xorg-server/glx/singlepix.c xorg-server/glx/singlepixswap.c xorg-server/glx/singlesize.c xorg-server/hw/dmx/dmxinit.c xorg-server/hw/kdrive/ephyr/ephyr.c xorg-server/hw/kdrive/ephyr/hostx.c xorg-server/hw/kdrive/ephyr/hostx.h xorg-server/hw/kdrive/src/kinput.c xorg-server/hw/xfree86/common/compiler.h xorg-server/hw/xwin/InitInput.c xorg-server/hw/xwin/InitOutput.c xorg-server/hw/xwin/ddraw.h xorg-server/hw/xwin/glx/glwrap.c xorg-server/hw/xwin/glx/indirect.c xorg-server/hw/xwin/glx/wgl_ext_api.h xorg-server/hw/xwin/glx/winpriv.c xorg-server/hw/xwin/win.h xorg-server/hw/xwin/winallpriv.c xorg-server/hw/xwin/winauth.c xorg-server/hw/xwin/winclipboard.h xorg-server/hw/xwin/winclipboardinit.c xorg-server/hw/xwin/winclipboardthread.c xorg-server/hw/xwin/winclipboardunicode.c xorg-server/hw/xwin/winclipboardwndproc.c xorg-server/hw/xwin/winclipboardwrappers.c xorg-server/hw/xwin/winclipboardxevents.c xorg-server/hw/xwin/wincmap.c xorg-server/hw/xwin/winconfig.c xorg-server/hw/xwin/wincreatewnd.c xorg-server/hw/xwin/wincursor.c xorg-server/hw/xwin/windialogs.c xorg-server/hw/xwin/winengine.c xorg-server/hw/xwin/winerror.c xorg-server/hw/xwin/wingc.c xorg-server/hw/xwin/wingetsp.c xorg-server/hw/xwin/winkeybd.c xorg-server/hw/xwin/winkeybd.h xorg-server/hw/xwin/winlayouts.h xorg-server/hw/xwin/winmisc.c xorg-server/hw/xwin/winmonitors.c xorg-server/hw/xwin/winmouse.c xorg-server/hw/xwin/winmsg.c xorg-server/hw/xwin/winmsg.h xorg-server/hw/xwin/winmultiwindowclass.c xorg-server/hw/xwin/winmultiwindowicons.c xorg-server/hw/xwin/winmultiwindowshape.c xorg-server/hw/xwin/winmultiwindowwindow.c xorg-server/hw/xwin/winmultiwindowwm.c xorg-server/hw/xwin/winmultiwindowwndproc.c xorg-server/hw/xwin/winnativegdi.c xorg-server/hw/xwin/winpfbdd.c xorg-server/hw/xwin/winpixmap.c xorg-server/hw/xwin/winpolyline.c xorg-server/hw/xwin/winprefs.c xorg-server/hw/xwin/winprocarg.c xorg-server/hw/xwin/winregistry.c xorg-server/hw/xwin/winscrinit.c xorg-server/hw/xwin/winsetsp.c xorg-server/hw/xwin/winshaddd.c xorg-server/hw/xwin/winshadddnl.c xorg-server/hw/xwin/winshadgdi.c xorg-server/hw/xwin/wintrayicon.c xorg-server/hw/xwin/winwin32rootless.c xorg-server/hw/xwin/winwin32rootlesswindow.c xorg-server/hw/xwin/winwin32rootlesswndproc.c xorg-server/hw/xwin/winwindow.c xorg-server/hw/xwin/winwindow.h xorg-server/hw/xwin/winwindowswm.c xorg-server/hw/xwin/winwndproc.c xorg-server/include/callback.h xorg-server/include/dixstruct.h xorg-server/include/misc.h xorg-server/include/os.h xorg-server/include/scrnintstr.h xorg-server/mi/micmap.c xorg-server/mi/miinitext.c xorg-server/mi/mioverlay.c xorg-server/mi/misprite.c xorg-server/mi/mivaltree.c xorg-server/mi/miwindow.c xorg-server/miext/damage/damage.c xorg-server/miext/rootless/rootlessGC.c xorg-server/miext/rootless/rootlessWindow.c xorg-server/os/WaitFor.c xorg-server/os/access.c xorg-server/os/connection.c xorg-server/os/io.c xorg-server/os/log.c xorg-server/os/osinit.c xorg-server/os/utils.c xorg-server/os/xdmcp.c xorg-server/os/xprintf.c xorg-server/os/xstrans.c xorg-server/render/mipict.c xorg-server/xkb/xkbActions.c xorg-server/xkb/xkbInit.c xorg-server/xkeyboard-config/compat/default.in
| * libX11 xserver fontconfig mesa pixman xkbcomp xkeyboard-config git updatemarha2012-03-234-14/+42
| | | | | | | | 23 Mar 2012
* | Merge remote-tracking branch 'origin/released'marha2012-03-121-1/+1
|\| | | | | | | | | | | | | | | Conflicts: libX11/src/OpenDis.c libX11/src/xcb_io.c xorg-server/xkeyboard-config/keymap/sun_vndr/all.in xorg-server/xkeyboard-config/semantics/default.in
| * xkeyboard-config fontconfig libX11 libXft libxcb mesa git update 12 Mar 2012marha2012-03-121-1/+1
| |
* | Merge remote-tracking branch 'origin/released'marha2012-03-082-90/+117
|\| | | | | | | | | Conflicts: pixman/pixman/pixman-mmx.c
| * fontconfig libXau libXdmcp libXext libXft libXinerama libXmu pixman mesamarha2012-03-082-90/+117
| | | | | | | | git update 8 Mar 2012
* | Merge remote-tracking branch 'origin/released'marha2012-02-291-10/+59
|\|
| * xserver fontconfig mesa pixman git update 29 Feb 2012marha2012-02-291-10/+59
| |
* | Merge remote-tracking branch 'origin/released'marha2012-02-242-2/+11
|\|
| * fontconfig libX11 pixman xserver git update 24 Feb 2012marha2012-02-242-2/+11
| |
* | Merge remote-tracking branch 'origin/released'marha2012-02-2210-306/+59
|\|
| * fontconfig libX11 libxcb mesa pixman xserver git update 22 Feb 2012marha2012-02-2210-306/+59
| |
* | Merge remote-tracking branch 'origin/released'marha2011-09-261-1/+1
|\| | | | | | | | | Conflicts: libXmu/src/CmapAlloc.c
| * fontconfig libX11 libXext libXft libXmu mesa git update 26 sep 2011marha2011-09-261-1/+1
| |
* | Synchronised line endinge with release branchmarha2011-09-1224-20805/+20805
| |
* | Merge remote-tracking branch 'origin/released'marha2011-06-271-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/xwininfo/configure.ac apps/xwininfo/xwininfo.c fontconfig/src/fcmatch.c mesalib/include/GL/internal/dri_interface.h mesalib/src/glsl/main.cpp mesalib/src/mesa/main/pack.c mesalib/src/mesa/main/renderbuffer.c mesalib/src/mesa/main/renderbuffer.h mesalib/src/mesa/main/teximage.c mesalib/src/mesa/state_tracker/st_cb_texture.c mesalib/src/mesa/state_tracker/st_draw.c mesalib/src/mesa/state_tracker/st_format.c pixman/configure.ac pixman/pixman/pixman-arm-neon-asm.S pixman/test/blitters-test.c
| * xwininfo fontconfig mesa pixman git update 27 June 2011marha2011-06-271-1/+1
| |
* | Merge remote-tracking branch 'origin/released'marha2011-06-213-9/+8
|\| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: fontconfig/doc/fcformat.fncs fontconfig/fc-cat/fc-cat.c fontconfig/fc-list/fc-list.c fontconfig/fc-match/fc-match.c fontconfig/src/fcdir.c fontconfig/src/fcformat.c fontconfig/src/fcname.c mesalib/src/glsl/linker.cpp mesalib/src/mesa/state_tracker/st_format.c
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-31 02:11:03 +0000