aboutsummaryrefslogtreecommitdiff
path: root/fontconfig/fc-lang/mai.orth
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-06-15 16:59:33 +0200
committermarha <marha@users.sourceforge.net>2011-06-15 16:59:33 +0200
commit6cba1e57f303d9b90add32c5e942375826fb1ab2 (patch)
tree1b2a17f873c059ed5eb1f153d1ed6b765d9ef315 /fontconfig/fc-lang/mai.orth
parentffc346f9ce29ccafb3b8108450bcff27d04e3b91 (diff)
parent0e661faf8cf2e3460b5e2389414f99c035ad4d6a (diff)
downloadvcxsrv-6cba1e57f303d9b90add32c5e942375826fb1ab2.tar.gz
vcxsrv-6cba1e57f303d9b90add32c5e942375826fb1ab2.tar.bz2
vcxsrv-6cba1e57f303d9b90add32c5e942375826fb1ab2.zip
Merge remote-tracking branch 'origin/released'
Conflicts: mesalib/docs/news.html mesalib/docs/relnotes.html mesalib/src/mesa/state_tracker/st_atom_blend.c mesalib/src/mesa/state_tracker/st_draw.c xorg-server/Xi/exevents.c xorg-server/dix/events.c xorg-server/include/dix.h
Diffstat (limited to 'fontconfig/fc-lang/mai.orth')
0 files changed, 0 insertions, 0 deletions