diff options
| author | Egbert Eich <eich@suse.de> | 2004-03-05 13:39:26 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-03-05 13:39:26 +0000 |
| commit | f1be04c808090763c1414b5f08b7b347498d2703 (patch) | |
| tree | a0b1faf78d12cfff404eaab57e96aa84f1cc5841 /src/XChgKMap.c | |
| parent | e096ac42209e3f383cd4e52cb4e2dff564bdbc8e (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).
Diffstat (limited to 'src/XChgKMap.c')
| -rw-r--r-- | src/XChgKMap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/XChgKMap.c b/src/XChgKMap.c index c698cc9..8ad77ca 100644 --- a/src/XChgKMap.c +++ b/src/XChgKMap.c @@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ -/* $XFree86: xc/lib/Xi/XChgKMap.c,v 3.4 2002/10/16 00:37:28 dawes Exp $ */ +/* $XFree86: xc/lib/Xi/XChgKMap.c,v 3.3 2001/12/14 19:55:04 dawes Exp $ */ /*********************************************************************** * |