aboutsummaryrefslogtreecommitdiff
path: root/fontconfig
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/released'marha2012-04-173-3/+6
|\
| * fontconfig mesa git update 17 Apr 2012marha2012-04-173-3/+6
| |
* | Merge remote-tracking branch 'origin/released'marha2012-04-136-67/+275
|\|
| * fontconfig xserver xkeyboard-config mesa git update 13 Apr 2012marha2012-04-137-74/+275
| |
* | Merge remote-tracking branch 'origin/released'marha2012-04-108-214/+209
|\| | | | | | | | | Conflicts: xorg-server/os/log.c
| * fontconfig mesa xkeyboard-config xserver pixman git update 10 Apr 2012marha2012-04-108-214/+209
| |
* | Merge remote-tracking branch 'origin/released'marha2012-03-302-4/+21
|\|
| * fontconfig git update 30 mar 2012marha2012-03-302-4/+21
| |
* | Merge remote-tracking branch 'origin/released'marha2012-03-294-16/+50
|\|
| * xserver fontconfig mesa git update 29 Mar 2012marha2012-03-294-16/+50
| |
* | Merge remote-tracking branch 'origin/released'marha2012-03-288-80/+57
|\|
| * xkeyboard-config pixman fontconfig mesa git update 28 Mar 2012marha2012-03-288-80/+57
| |
* | 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-2610-10/+70
|\|
| * fontconfig libxcb mesa xkeyboard-config git update 26 Mar 2012marha2012-03-2610-10/+70
| |
* | Merge remote-tracking branch 'origin/released'marha2012-03-2620-88/+206
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-2320-88/+206
| | | | | | | | 23 Mar 2012
* | Merge remote-tracking branch 'origin/released'marha2012-03-131-10/+11
|\|
| * fontconfig mesa git update 13 Mar 2012marha2012-03-131-10/+11
| |
* | Merge remote-tracking branch 'origin/released'marha2012-03-1217-67/+189
|\| | | | | | | | | | | | | | | 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-1217-67/+189
| |
* | Merge remote-tracking branch 'origin/released'marha2012-03-094-164/+179
|\| | | | | | | | | Conflicts: libxcb/src/xcb_in.c
| * libxcb fontconfig pixman mesa git update 9 Mar 2012marha2012-03-094-164/+179
| |
* | Merge remote-tracking branch 'origin/released'marha2012-03-083-90/+122
|\| | | | | | | | | Conflicts: pixman/pixman/pixman-mmx.c
| * fontconfig libXau libXdmcp libXext libXft libXinerama libXmu pixman mesamarha2012-03-083-90/+122
| | | | | | | | git update 8 Mar 2012
* | Merge remote-tracking branch 'origin/released'marha2012-02-292-11/+60
|\|
| * xserver fontconfig mesa pixman git update 29 Feb 2012marha2012-02-292-11/+60
| |
* | Synchronised makefile with makefile.ammarha2012-02-271-1/+3
| |
* | Merge remote-tracking branch 'origin/released'marha2012-02-273-1/+78
|\| | | | | | | | | Conflicts: pixman/pixman/pixman-mmx.c
| * fontconfig pixman mesa git update 27 Feb 2012marha2012-02-273-1/+78
| |
* | synchronised makefile with makefile.ammarha2012-02-241-1/+4
| |
* | Merge remote-tracking branch 'origin/released'marha2012-02-249-3/+137
|\|
| * fontconfig libX11 pixman xserver git update 24 Feb 2012marha2012-02-249-3/+137
| |
* | Merge remote-tracking branch 'origin/released'marha2012-02-2223-350/+425
|\|
| * fontconfig libX11 libxcb mesa pixman xserver git update 22 Feb 2012marha2012-02-2223-350/+425
| |
* | Merge remote-tracking branch 'origin/released'marha2011-10-101-2/+2
|\|
| * fontconfig libX11 mesa pixman xkeyboard-config git updte 10 oct 2011marha2011-10-101-2/+2
| |
* | Merge remote-tracking branch 'origin/released'marha2011-10-061-1/+1
|\|
| * upgraded to inputproto-2.1.99.1marha2011-10-061-1/+1
| | | | | | | | xwininfo fontconfig libXau mesa xkeyboard-config git update 6 oct 2011
* | 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-12268-74151/+74151
| |
* | 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-217-79/+39
|\| | | | | | | | | | | | | | | | | | | | | | | | | 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
| * fontconfig mesa git update 21 June 2011marha2011-06-217-79/+39
| |
* | Added gitignore filesmarha2011-05-305-96/+7
| |
* | svn merge ^/branches/released .marha2011-03-295-440/+453
|\|
| * xserver fontconfig mesa git update 29 Mar 2011marha2011-03-295-17/+30
| |