729N/A###############################################################################
729N/A#
943N/A# Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
729N/A#
729N/A# Permission is hereby granted, free of charge, to any person obtaining a
919N/A# copy of this software and associated documentation files (the "Software"),
919N/A# to deal in the Software without restriction, including without limitation
919N/A# the rights to use, copy, modify, merge, publish, distribute, sublicense,
919N/A# and/or sell copies of the Software, and to permit persons to whom the
919N/A# Software is furnished to do so, subject to the following conditions:
919N/A#
919N/A# The above copyright notice and this permission notice (including the next
919N/A# paragraph) shall be included in all copies or substantial portions of the
919N/A# Software.
919N/A#
919N/A# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
919N/A# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
919N/A# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
919N/A# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
919N/A# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
919N/A# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
919N/A# DEALINGS IN THE SOFTWARE.
729N/A#
729N/A
1068N/Adiff -urp -x '*~' -x '*.orig' config/config.cpp config/config.cpp
1068N/A--- config/config.cpp 2010-08-06 18:40:29.000000000 -0700
1068N/A+++ config/config.cpp 2011-01-28 18:01:17.331211005 -0800
729N/A@@ -1,6 +1,13 @@
1068N/A # X font server configuration file
1068N/A # See xfs(__appmansuffix__) man page for more information.
729N/A
851N/A+XCOMM DO NOT EDIT /usr/lib/X11/fs/config directly.
729N/A+XCOMM
851N/A+XCOMM /usr/lib/X11/fs/config is a factory-default file and will
729N/A+XCOMM be unconditionally overwritten upon subsequent installation.
729N/A+XCOMM Before making changes to the file, copy it to the system configuration
729N/A+XCOMM location, /etc/X11/fs/config and edit it there.
729N/A+
729N/A clone-self = on
729N/A use-syslog = off
729N/A catalogue = DEFAULTFONTPATH