[bash-completion/el6/master: 15/15] Merge branch 'master' into el6
Ville Skyttä
scop at fedoraproject.org
Sun Oct 3 22:14:25 UTC 2010
commit 624fe98be011f465e07f65c0b400a34b610320e5
Merge: 60b0bb9 c506b64
Author: Ville Skyttä <ville.skytta at iki.fi>
Date: Mon Oct 4 01:13:05 2010 +0300
Merge branch 'master' into el6
Conflicts:
.gitignore
bash-completion.spec
sources
.gitignore | 3 +-
bash-completion-1.1-service.patch | 25 ---
bash-completion-1.1-vncviewer.patch | 43 -----
bash-completion-1.2-init.d.patch | 19 +++
bash-completion-1.2-known_hosts-ipv6-630658.patch | 14 ++
bash-completion-1.2-rpm-630328.patch | 78 +++++++++
bash-completion-1.2-tilde-username-628130.patch | 117 +++++++++++++
bash-completion.spec | 181 +++++++++++++++------
bash_completion.sh | 12 --
sources | 3 +-
10 files changed, 362 insertions(+), 133 deletions(-)
---
More information about the scm-commits
mailing list