aboutsummaryrefslogtreecommitdiff
path: root/libXmu/include/X11/Xmu/CvtCache.h
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-09-19 13:39:03 +0200
committermarha <marha@users.sourceforge.net>2011-09-19 13:39:03 +0200
commit1678a69116d1c6ce900fe15f7813613bb28416dd (patch)
tree9589536f6b4bd60b34f90cf5ed20240d40bbb38c /libXmu/include/X11/Xmu/CvtCache.h
parent9d911bc1246139019e555f443e934677a067bc0a (diff)
parentb2c925e360e2c366526de15b44603f855f94139c (diff)
downloadvcxsrv-1678a69116d1c6ce900fe15f7813613bb28416dd.tar.gz
vcxsrv-1678a69116d1c6ce900fe15f7813613bb28416dd.tar.bz2
vcxsrv-1678a69116d1c6ce900fe15f7813613bb28416dd.zip
Merge remote-tracking branch 'origin/released'
Conflicts: libfontenc/src/fontenc.c
Diffstat (limited to 'libXmu/include/X11/Xmu/CvtCache.h')
-rw-r--r--libXmu/include/X11/Xmu/CvtCache.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/libXmu/include/X11/Xmu/CvtCache.h b/libXmu/include/X11/Xmu/CvtCache.h
index 7441e2f2e..714a4984e 100644
--- a/libXmu/include/X11/Xmu/CvtCache.h
+++ b/libXmu/include/X11/Xmu/CvtCache.h
@@ -1,5 +1,5 @@
/*
-
+
Copyright 1989, 1998 The Open Group
Permission to use, copy, modify, distribute, and sell this software and its
@@ -26,7 +26,7 @@ in this Software without prior written authorization from The Open Group.
/*
* Public Interfaces
- *
+ *
* XmuCvtCache *XmuCvtCacheLookupDisplay (dpy)
* Display *dpy;
*/