svn merge ^/branches/released .

1 files changed, 33 insertions, 0 deletions

diff --git a/fontconfig/fc-lang/sh.orth b/fontconfig/fc-lang/sh.orth
new file mode 100644
index 000000000..80dae3ebd
--- /dev/null
+++ b/fontconfig/fc-lang/sh.orth
@@ -0,0 +1,33 @@
+#
+# fontconfig/fc-lang/sh.orth
+#
+# Copyright © 2002 Keith Packard
+# Copyright © 2009 Roozbeh Pournader
+#
+# Permission to use, copy, modify, distribute, and sell this software and its
+# documentation for any purpose is hereby granted without fee, provided that
+# the above copyright notice appear in all copies and that both that
+# copyright notice and this permission notice appear in supporting
+# documentation, and that the name of the author(s) not be used in
+# advertising or publicity pertaining to distribution of the software without
+# specific, written prior permission.  The author(s) make(s) no
+# representations about the suitability of this software for any purpose.  It
+# is provided "as is" without express or implied warranty.
+#
+# THE AUTHOR(S) DISCLAIM(S) ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+# EVENT SHALL THE AUTHOR(S) BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+# DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+# PERFORMANCE OF THIS SOFTWARE.
+#
+# Serbo-Croatian (sh)
+#
+# This tag is deprecated since 2000 in ISO 639-1 and BCP 47. It is kept here
+# for backward compatibility. Since ISO 639-3 defines this as a
+# macrolanguage consisting of Bosnian, Croatian, and Serbian, we union
+# those three.
+include ba.orth
+include hr.orth
+include sr.orth