dotfiles

commit 0dd18616b3b4d05e79950f6caf5f80ae3f6f2602
parent 8c5b7af792489c8a17a46ba9114cffc094a3a066
Author: Anders Damsgaard Christensen <adc@geo.au.dk>
Date:   Thu, 13 Sep 2012 17:59:28 +0200

Merge branch 'master' of https://github.com/anders-dc/dotfiles
Accidentally pushed before pull

Diffstat:
M
.bashrc
 | 
2
+-
M
.tmux.conf
 | 
1
-

2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/.bashrc b/.bashrc
@@ -96,7 +96,7 @@ if [ `hostname` == "adc-stationary" ]; then
 fi
 
 # Transparent xterm background
-[ -n "$WINDOWID" ] && transset-df -i $WINDOWID >/dev/null
+#[ -n "$WINDOWID" ] && transset-df -i $WINDOWID >/dev/null
 
 complete -cf sudo
 
diff --git a/.tmux.conf b/.tmux.conf
@@ -1,4 +1,3 @@
-
 bind r source-file ~/.tmux.conf \; display "Source file reloaded"
 
 bind h select-pane -L