diff options
author | Karoly Lorentey <[email protected]> | 2007-02-24 19:26:54 +0000 |
---|---|---|
committer | Karoly Lorentey <[email protected]> | 2007-02-24 19:26:54 +0000 |
commit | f65f7603312547e51230192daf34349b8ac569a0 (patch) | |
tree | cbc5877854d00bbdd5ecd4906d130ab8fbb44430 /etc/Xkeymap.txt | |
parent | 9440b75fccbf763e3fb23a31a128d97eb4debdf5 (diff) | |
parent | 735895f1fa28f88c559e73910ea0ff0bda0f228c (diff) |
Merged from [email protected]
Patches applied:
* [email protected]/emacs--devo--0--patch-619
Update from CVS
* [email protected]/emacs--devo--0--patch-620
Update from CVS
* [email protected]/emacs--devo--0--patch-621
Merge from gnus--rel--5.10
* [email protected]/emacs--devo--0--patch-622
Update from CVS
* [email protected]/emacs--devo--0--patch-623
Remove RCS keywords
* [email protected]/emacs--devo--0--patch-624
Update from CVS
* [email protected]/emacs--devo--0--patch-625
Update from CVS
* [email protected]/emacs--devo--0--patch-626
Update from CVS
* [email protected]/emacs--devo--0--patch-627
Update from CVS
* [email protected]/emacs--devo--0--patch-628
Update from CVS
* [email protected]/emacs--devo--0--patch-629
Merge from gnus--rel--5.10
* [email protected]/emacs--devo--0--patch-630
Update from CVS
* [email protected]/emacs--devo--0--patch-631
Update from CVS
* [email protected]/emacs--devo--0--patch-632
Update from CVS
* [email protected]/emacs--devo--0--patch-633
Update from CVS
* [email protected]/emacs--devo--0--patch-634
Update from CVS
* [email protected]/emacs--devo--0--patch-635
Update from CVS
* [email protected]/emacs--devo--0--patch-636
Update from CVS
* [email protected]/emacs--devo--0--patch-637
Remove RCS keywords
* [email protected]/emacs--devo--0--patch-638
Update from CVS
* [email protected]/emacs--devo--0--patch-639
Update from CVS
* [email protected]/emacs--devo--0--patch-640
Update from CVS
* [email protected]/emacs--devo--0--patch-641
Update from CVS
* [email protected]/emacs--devo--0--patch-642
Merge from gnus--rel--5.10
* [email protected]/emacs--devo--0--patch-643
Update from CVS
* [email protected]/emacs--devo--0--patch-644
Update from CVS
* [email protected]/emacs--devo--0--patch-645
Update from CVS
* [email protected]/emacs--devo--0--patch-646
Update from CVS
* [email protected]/emacs--devo--0--patch-647
Update from CVS
* [email protected]/emacs--devo--0--patch-648
Update from CVS
* [email protected]/emacs--devo--0--patch-649
Update from CVS
* [email protected]/gnus--rel--5.10--patch-197
Merge from emacs--devo--0
* [email protected]/gnus--rel--5.10--patch-198
Update from CVS
* [email protected]/gnus--rel--5.10--patch-199
Update from CVS
* [email protected]/gnus--rel--5.10--patch-200
Merge from emacs--devo--0
* [email protected]/gnus--rel--5.10--patch-201
Update from CVS: lisp/nnweb.el (nnweb-google-parse-1): Update parser.
* [email protected]/gnus--rel--5.10--patch-202
Update from CVS
git-archimport-id: [email protected]/emacs--multi-tty--0--patch-596
Diffstat (limited to 'etc/Xkeymap.txt')
-rw-r--r-- | etc/Xkeymap.txt | 26 |
1 files changed, 15 insertions, 11 deletions
diff --git a/etc/Xkeymap.txt b/etc/Xkeymap.txt index fa97f7da01..e34d100fb2 100644 --- a/etc/Xkeymap.txt +++ b/etc/Xkeymap.txt @@ -3,7 +3,7 @@ # # Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007 # Free Software Foundation, Inc. -# See the end of the file for copying conditions. +# See the end of the file for license conditions. # # This file contains the default keyboard mapping. The first column contains a X keyboard code; the other # 16 columns contain the mapping of the keycode to a character string, with various combinations @@ -102,15 +102,19 @@ # tab-width: 4 # End: # -# COPYING CONDITIONS -# Permission is hereby granted, free of charge, to any person obtaining -# a copy of this file, to deal in the file without restriction, including -# without limitation the rights to use, copy, modify, merge, publish, -# distribute, sublicense, and/or sell copies of the file, and to -# permit persons to whom the file is furnished to do so, subject to -# the following condition: +# This document is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This document is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this document; see the file COPYING. If not, write to the +# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +# Boston, MA 02110-1301, USA. # -# The above copyright notice and this permission notice shall be -# included in all copies or substantial portions of the file. - # arch-tag: cbaa71af-719b-4647-a2c1-cd4d36a4fc64 |