From: Phillip Berndt <phillip.berndt@googlemail.com>
Date: Thu, 30 Jan 2014 12:45:31 +0000 (+0100)
Subject: Merge http://github.com/voda/autorandr
X-Git-Tag: 1.0~145
X-Git-Url: https://git.donarmstrong.com/?p=deb_pkgs%2Fautorandr.git;a=commitdiff_plain;h=eef58b0a5d7ef7c90afc1175fd0793270159a146

Merge http://github.com/voda/autorandr

Conflicts:
	bash_completion/autorandr
---

eef58b0a5d7ef7c90afc1175fd0793270159a146
diff --cc bash_completion/autorandr
index 151c596,aed6175..14b4ddb
--- a/bash_completion/autorandr
+++ b/bash_completion/autorandr
@@@ -9,11 -9,10 +9,11 @@@ _autorandr (
  	prev="${COMP_WORDS[COMP_CWORD-1]}"
  
  	opts="-h -c -s -l -d"
- 	lopts="--help --change --save --load --default --force --fingerprint"
+ 	lopts="--help --change --save --load --default --force --fingerprint --config"
 -	prfls=""
 -	if [ -d ~/.autorandr/ ]; then
 +	if [ -d ~/.autorandr ]; then
  		prfls="`find ~/.autorandr/* -maxdepth 1 -type d -printf '%f\n'`"
 +	else
 +		prfls=""
  	fi
  
  	case "${cur}" in