[Bash-completion-commits] [SCM] bash-completion branch, master, updated. 1.3-235-g26ae770

[Igor Murzov]

The following commit has been merged in the master branch:
commit 5e5efa50838f1a8422614ad383c6b84b98179963
Merge: 10bd7d3d412509378256ce1ca6f2ed97eb58d800 448106b098aa83bd5c67f584096044ed99e68202
Author: Igor Murzov <igor at gplsoft.org>
Date:   Thu Apr 21 22:35:19 2011 +0400

    Merge remote-tracking branch 'origin/master' into slackware
    
    Conflicts:
    	completions/pkgtools

diff --combined completions/Makefile.am
index ad895a3,1a92e1d..2254475
--- a/completions/Makefile.am
+++ b/completions/Makefile.am
@@@ -107,6 -107,7 +107,7 @@@ bashcomp_DATA = abook 
  		ntpdate \
  		openldap \
  		openssl \
+ 		open-iscsi \
  		p4 \
  		perl \
  		pine \
@@@ -119,33 -120,31 +120,35 @@@
  		postgresql \
  		povray \
  		procps \
+ 		puppet \
  		python \
  		qdbus \
  		qemu \
  		quota-tools \
  		rcs \
  		rdesktop \
+ 		reptyr \
  		reportbug \
  		resolvconf \
  		rfkill \
  		ri \
  		rpcdebug \
  		rpm \
 +		rpm2tgz \
  		rpmcheck \
  		rrdtool \
  		rsync \
  		rtcwake \
  		samba \
  		sbcl \
 +		sbopkg \
  		screen \
  		service \
  		sh \
  		shadow \
  		sitecopy \
 +		slackpkg \
 +		slapt \
  		smartctl \
  		snownews \
  		sqlite3 \

-- 
bash-completion