svn merge ^/branches/released .

1 files changed, 40 insertions, 40 deletions

diff --git a/fontconfig/fc-lang/aa.orth b/fontconfig/fc-lang/aa.orth
index 58658ce84..d4e59d326 100644
--- a/fontconfig/fc-lang/aa.orth
+++ b/fontconfig/fc-lang/aa.orth
@@ -1,40 +1,40 @@
-#
-# fontconfig/fc-lang/aa.orth
-#
-# Copyright © 2002 Keith Packard
-#
-# 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 Keith Packard not be used in
-# advertising or publicity pertaining to distribution of the software without
-# specific, written prior permission.  Keith Packard makes no
-# representations about the suitability of this software for any purpose.  It
-# is provided "as is" without express or implied warranty.
-#
-# THE AUTHOR(S) DISCLAIMS 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.
-#
-# Afar (AA)
-#
-# Taken from http://www.arhotaba.com/waldegram.htm
-# and http://www.arhotaba.com/alphabet.htm
-#
-0041-005a	# afar doesn't use J, P, V or Z
-0061-007a	# afar doesn't use j, p, v or z
-00C2 #	LATIN CAPITAL LETTER A WITH CIRCUMFLEX
-00CA #	LATIN CAPITAL LETTER E WITH CIRCUMFLEX
-00CE #	LATIN CAPITAL LETTER I WITH CIRCUMFLEX
-00D4 #	LATIN CAPITAL LETTER O WITH CIRCUMFLEX
-00DB #	LATIN CAPITAL LETTER U WITH CIRCUMFLEX
-00E2 #	LATIN SMALL LETTER A WITH CIRCUMFLEX
-00EA #	LATIN SMALL LETTER E WITH CIRCUMFLEX
-00EE #	LATIN SMALL LETTER I WITH CIRCUMFLEX
-00F4 #	LATIN SMALL LETTER O WITH CIRCUMFLEX
-00FB #	LATIN SMALL LETTER U WITH CIRCUMFLEX
+#

+# fontconfig/fc-lang/aa.orth

+#

+# Copyright © 2002 Keith Packard

+#

+# 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 authors make no

+# representations about the suitability of this software for any purpose.  It

+# is provided "as is" without express or implied warranty.

+#

+# THE AUTHOR(S) DISCLAIMS 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.

+#

+# Afar (AA)

+#

+# Taken from http://www.arhotaba.com/waldegram.htm

+# and http://www.arhotaba.com/alphabet.htm

+#

+0041-005a	# afar doesn't use J, P, V or Z

+0061-007a	# afar doesn't use j, p, v or z

+00C2 #	LATIN CAPITAL LETTER A WITH CIRCUMFLEX

+00CA #	LATIN CAPITAL LETTER E WITH CIRCUMFLEX

+00CE #	LATIN CAPITAL LETTER I WITH CIRCUMFLEX

+00D4 #	LATIN CAPITAL LETTER O WITH CIRCUMFLEX

+00DB #	LATIN CAPITAL LETTER U WITH CIRCUMFLEX

+00E2 #	LATIN SMALL LETTER A WITH CIRCUMFLEX

+00EA #	LATIN SMALL LETTER E WITH CIRCUMFLEX

+00EE #	LATIN SMALL LETTER I WITH CIRCUMFLEX

+00F4 #	LATIN SMALL LETTER O WITH CIRCUMFLEX

+00FB #	LATIN SMALL LETTER U WITH CIRCUMFLEX