summaryrefslogtreecommitdiff
path: root/include/X11
diff options
context:
space:
mode:
authorEgbert Eich <eich@suse.de>2004-03-04 17:47:13 +0000
committerEgbert Eich <eich@suse.de>2004-03-04 17:47:13 +0000
commitaa7a83afdf32874b9f1a7a1df7eded54d9adf5c8 (patch)
tree7cd7239aafa023cd6cbf98640637111e5f8f63e0 /include/X11
parent0b1b9f59f2513f5e2795cba34c747b0e68f4b9b1 (diff)
18. Merged in XFree86 code up to 4.4.0 including changes to files that had
a changed license. There was only one change which happened to be from me (Egbert Eich).
Diffstat (limited to 'include/X11')
-rw-r--r--include/X11/fonts/fontenc.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/X11/fonts/fontenc.h b/include/X11/fonts/fontenc.h
index 6145314..09472cf 100644
--- a/include/X11/fonts/fontenc.h
+++ b/include/X11/fonts/fontenc.h
@@ -20,7 +20,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
*/
-/* $XFree86: xc/lib/font/include/fontenc.h,v 1.8 2001/08/13 21:46:48 dawes Exp $ */
+/* $XFree86: xc/lib/font/include/fontenc.h,v 1.7 2000/11/14 16:54:45 dawes Exp $ */
/* Header for backend-independent encoding code */