summaryrefslogtreecommitdiffstats
path: root/inputrc
diff options
context:
space:
mode:
authorMageia SVN-Git Migration <svn-git-migration@mageia.org>2012-01-29 21:20:51 +0000
committerMageia SVN-Git Migration <svn-git-migration@mageia.org>2012-01-29 21:20:51 +0000
commit7c6511ed3a51cf5943a25013425e60c67184133f (patch)
tree3a180979a75990f5c27d1b5644cd46e76f378c62 /inputrc
parent23ce3c3c63d11971b05223af3d4fa6213cdd5071 (diff)
downloadsetup-7c6511ed3a51cf5943a25013425e60c67184133f.tar
setup-7c6511ed3a51cf5943a25013425e60c67184133f.tar.gz
setup-7c6511ed3a51cf5943a25013425e60c67184133f.tar.bz2
setup-7c6511ed3a51cf5943a25013425e60c67184133f.tar.xz
setup-7c6511ed3a51cf5943a25013425e60c67184133f.zip
Synthesized commit during git-svn import combining previous Mandriva history with Mageia.
This commit consitsts of the following subversion commits: ------------------------------------------------------------------------ r2856 | dmorgan | 2012-01-29 21:20:51 +0000 (Sun, 29 Jan 2012) | 1 line Import setup ------------------------------------------------------------------------ In addition to the above commits, the following cleaning work has been recorded: - Replace "Mandriva" with "Mageia" in 'fprintf (stderr, "Mageia Linux run-parts program, version " VERSION "\n" ' in file utils/run-parts.c - License is 'public domain' according to the relevant rpm spec file which is written by Mandriva (no explicit COPYING or LICENSE files) - run-parts is GPLv2+ according to the copyright headers (Debian)
Diffstat (limited to 'inputrc')
-rw-r--r--inputrc3
1 files changed, 2 insertions, 1 deletions
diff --git a/inputrc b/inputrc
index 29ec92b..4113588 100644
--- a/inputrc
+++ b/inputrc
@@ -1,5 +1,6 @@
-## Mandriva Linux Configuration
+## Mageia Linux Configuration
# (c) Mandriva 1999-2005
+# (c) Mageia 2011-2012
# Chmouel Boudjnah, Pablo Saratxaga <pablo@mandriva.com>
# $Id: inputrc 105875 2005-12-07 06:56:46Z flepied $