0N/A###############################################################################

0N/A#

1339N/A# Copyright 2009 Sun Microsystems, Inc. All rights reserved.

0N/A# Use is subject to license terms.

1339N/A#

0N/A# Permission is hereby granted, free of charge, to any person obtaining a

0N/A# copy of this software and associated documentation files (the

919N/A# "Software"), to deal in the Software without restriction, including

919N/A# without limitation the rights to use, copy, modify, merge, publish,

919N/A# distribute, and/or sell copies of the Software, and to permit persons

919N/A# to whom the Software is furnished to do so, provided that the above

919N/A# copyright notice(s) and this permission notice appear in all copies of

919N/A# the Software and that both the above copyright notice(s) and this

919N/A# permission notice appear in supporting documentation.

919N/A#

919N/A# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS

919N/A# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

919N/A# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT

919N/A# OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR

919N/A# HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL

919N/A# INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING

919N/A# FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,

919N/A# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION

919N/A# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

0N/A#

0N/A# Except as contained in this notice, the name of a copyright holder

0N/A# shall not be used in advertising or otherwise to promote the sale, use

0N/A# or other dealings in this Software without prior written authorization

967N/A# of the copyright holder.

0N/A#

493N/A

493N/Adiff -urp -x '*~' -x '*.orig' config.cpp config.cpp

493N/A--- config.cpp 2008-12-03 19:43:27.000000000 -0800

970N/A+++ config.cpp 2009-06-18 14:33:55.670348000 -0700

970N/A@@ -1,6 +1,13 @@

970N/A XCOMM X font server configuration file

970N/A XCOMM See xfs(__appmansuffix__) man page for more information.

970N/A

970N/A+XCOMM DO NOT EDIT /usr/X11/lib/X11/fs/config directly.

970N/A+XCOMM

970N/A+XCOMM /usr/X11/lib/X11/fs/config is a factory-default file and will

970N/A+XCOMM be unconditionally overwritten upon subsequent installation.

970N/A+XCOMM Before making changes to the file, copy it to the system configuration

970N/A+XCOMM location, /etc/X11/fs/config and edit it there.

970N/A+

970N/A clone-self = on

970N/A use-syslog = off

970N/A catalogue = DEFAULTFONTPATH

970N/A