diff options
| author | Egbert Eich <eich@suse.de> | 2004-03-04 17:47:15 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-03-04 17:47:15 +0000 |
| commit | 84b50beb70b96eff7139e0a1b3980a15dd4aaada (patch) | |
| tree | 1ec04355bf9b43a585c0219c6b5111f26cfa5f81 | |
| parent | 24880ca5a806dd6f5cd2d94efa552bbadd635e49 (diff) | |
18. Merged in XFree86 code up to 4.4.0 including changes to files that hadxo-6_7_0XPRINT_BEGINXPRINT_BASEXORG-TM-CYGWIN-MERGEXORG-TM-CYGWIN-LAST-MERGEXORG-RELEASE-1-TM-MERGEXORG-RELEASE-1-TM-CLOSEDXORG-RELEASE-1-TM-BASEXORG-RELEASE-1-STSF-FORKXORG-RELEASE-1-MERGEXORG-CYGWIN-MERGEXORG-CYGWIN-LAST-MERGEXORG-6_7_0IPv6-REVIEW-BASEXPRINTXORG-RELEASE-1-TMXORG-RELEASE-1-STSFXORG-RELEASE-1IPv6-REVIEW
a changed license. There was only one change which happened to be from
me (Egbert Eich).
| -rw-r--r-- | include/X11/extensions/XKBui.h | 2 | ||||
| -rw-r--r-- | src/XKBui.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/X11/extensions/XKBui.h b/include/X11/extensions/XKBui.h index 2a8b73b..36c66df 100644 --- a/include/X11/extensions/XKBui.h +++ b/include/X11/extensions/XKBui.h @@ -26,7 +26,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/xkbui/XKBui.h,v 3.1 2003/11/17 22:20:25 dawes Exp $ */ +/* $XFree86$ */ #include <X11/Xlib.h> #include <X11/XKBlib.h> diff --git a/src/XKBui.c b/src/XKBui.c index ed2ed3c..294bd02 100644 --- a/src/XKBui.c +++ b/src/XKBui.c @@ -24,7 +24,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/xkbui/XKBui.c,v 3.7 2003/11/17 22:20:25 dawes Exp $ */ +/* $XFree86: xc/lib/xkbui/XKBui.c,v 3.6 1999/06/20 07:14:08 dawes Exp $ */ #include <X11/Xos.h> #include <stdio.h> |