summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEgbert Eich <eich@suse.de>2004-03-05 13:38:51 +0000
committerEgbert Eich <eich@suse.de>2004-03-05 13:38:51 +0000
commit37943e470df52594b544a275a141ecbc0422addd (patch)
tree6ee0e084345d5461159f85b35f2efb378d50ca46
parenta3557f2e82e07580a5f7ceb41c49809a001b73e5 (diff)
23. Merged with XFree86 4.4.0. Added changes that went into infected files.XORG-CURRENT-premerge-release-1XACE-SELINUX-BASEDAMAGE-XFIXES-BASEDAMAGE-XFIXES
Reverted darwin/bundle/**/Credits.rtf to XFree86 versions to avoid future conflicts on ASCII but not humal readable files. (There should probably be separate CreditsXorg.rtf files) (Egbert Eich).
-rw-r--r--ucs2any.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/ucs2any.c b/ucs2any.c
index fbd2e03..dc9543f 100644
--- a/ucs2any.c
+++ b/ucs2any.c
@@ -33,7 +33,7 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*/
-/* $XFree86: xc/fonts/util/ucs2any.c,v 1.1 2003/09/21 10:54:14 herrb Exp $ */
+/* $XFree86$ */
/*
* This utility allows you to generate from an ISO10646-1 encoded
* BDF font other BDF fonts in any possible encoding. This way, you can