aboutsummaryrefslogtreecommitdiff
path: root/libXft
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/released'marha2012-06-041-1/+1
|\
| * fontconfig libX11 libXft mesa pixman xserver xkeyboard-config git update 4marha2012-06-041-1/+1
| | | | | | | | May 2012
* | Merge remote-tracking branch 'origin/released'marha2012-03-122-14/+0
|\| | | | | | | | | | | | | | | 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-122-14/+0
| |
* | Merge remote-tracking branch 'origin/released'marha2012-03-083-5/+15
|\| | | | | | | | | Conflicts: pixman/pixman/pixman-mmx.c
| * fontconfig libXau libXdmcp libXext libXft libXinerama libXmu pixman mesamarha2012-03-083-5/+15
| | | | | | | | git update 8 Mar 2012
* | Merge remote-tracking branch 'origin/released'marha2011-10-271-0/+3
|\|
| * libX11 libXft mesa mkfontscale pixman xserver git update 26 okt 2011marha2011-10-261-0/+3
| |
* | Merge remote-tracking branch 'origin/released'marha2011-10-195-347/+409
|\| | | | | | | | | Conflicts: xorg-server/include/os.h
| * libX11 libXext libXft mesa libxcb mkfontscale pixman xservermarha2011-10-195-347/+409
| | | | | | | | xkeyboard-config git update 19 oct 2011
* | Merge remote-tracking branch 'origin/released'marha2011-09-294-7/+7
|\|
| * xwininfo libXft mesa git update 29 sep 2011marha2011-09-294-7/+7
| |
* | Merge remote-tracking branch 'origin/released'marha2011-09-263-32/+3
|\| | | | | | | | | Conflicts: libXmu/src/CmapAlloc.c
| * fontconfig libX11 libXext libXft libXmu mesa git update 26 sep 2011marha2011-09-263-32/+3
| |
* | Merge remote-tracking branch 'origin/released'marha2011-09-1916-266/+266
|\| | | | | | | | | Conflicts: libfontenc/src/fontenc.c
| * xtrans libX11 libXext libXdmcp libXau libXft libXinerama libXmu libfontencmarha2011-09-1916-266/+266
| | | | | | | | mesa git update 19 sept 2011
* | Synchronised line endinge with release branchmarha2011-09-124-3083/+3083
| |
* | Added gitignore filesmarha2011-05-302-80/+0
| |
* | svn merge ^/branches/released .marha2011-03-254-3074/+3083
|\|
| * git update until 25 Mar 2011marha2011-03-254-41/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | xserver fontconfig glproto libXau libXft libXmu libfontenc libxcb mesa mkfontscale pixman randrproto xkeyboard-config xtrans xwininfo updated following packages: xproto-7.0.21 xineramaproto-1.2.1 libXt-1.1.1 libxkbfile-1.0.7 libXpm-3.5.9 libXfont-1.4.3 libXaw-1.0.9 bdftopcf-1.0.3 encodings-1.0.4 fixesproto-5.0 font-adobe-100dpi-1.0.3 font-adobe-75dpi-1.0.3 font-adobe-utopia-100dpi-1.0.4 font-adobe-utopia-75dpi-1.0.4 font-adobe-utopia-type1-1.0.4 font-alias-1.0.3 font-arabic-misc-1.0.3 font-bh-100dpi-1.0.3 font-bh-75dpi-1.0.3 font-bh-lucidatypewriter-100dpi-1.0.3 font-bh-lucidatypewriter-75dpi-1.0.3 font-bh-ttf-1.0.3 font-bh-type1-1.0.3 font-bitstream-100dpi-1.0.3 font-bitstream-75dpi-1.0.3 font-bitstream-speedo-1.0.2 font-bitstream-type1-1.0.3 font-cronyx-cyrillic-1.0.3 font-cursor-misc-1.0.3 font-daewoo-misc-1.0.3 font-dec-misc-1.0.3 font-ibm-type1-1.0.3 font-isas-misc-1.0.3 font-jis-misc-1.0.3 font-micro-misc-1.0.3 font-misc-cyrillic-1.0.3 font-misc-ethiopic-1.0.3 font-misc-meltho-1.0.3 font-misc-misc-1.1.2 font-mutt-misc-1.0.3 font-schumacher-misc-1.1.2 font-screen-cyrillic-1.0.4 font-sony-misc-1.0.3 font-sun-misc-1.0.3 font-util-1.2.0 font-winitzki-cyrillic-1.0.3 font-xfree86-type1-1.0.4
* | Added makefiles for fontconfig libXft and libXrendermarha2011-01-192-0/+640
|/ | | | | | | Added libxml2 include files and library Added iconf.h Enabled XRENDER in xclock
* Added libXft-2.2.0 fontconfig-2.8.0 libXrender-0.9.6 marha2011-01-1932-0/+9744