From 7948b25cf4a4be75d62728e38f1844f25ffb7a8c Mon Sep 17 00:00:00 2001
From: Thomas Ruoff <ThomasRuoff@gmail.com>
Date: Mon, 30 Jan 2012 23:14:38 +0100
Subject: [PATCH] merge oh-my-zsh, enable the completion dots

---
 oh-my-zsh | 2 +-
 zshrc     | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/oh-my-zsh b/oh-my-zsh
index 48a32a3..6f8e7b0 160000
--- a/oh-my-zsh
+++ b/oh-my-zsh
@@ -1 +1 @@
-Subproject commit 48a32a30853531b94cfb842cd528ea14b12b2819
+Subproject commit 6f8e7b0e4f1c11308c7471bbff7614ca43898724
diff --git a/zshrc b/zshrc
index 40190af..c772789 100644
--- a/zshrc
+++ b/zshrc
@@ -19,6 +19,9 @@ export DISABLE_AUTO_UPDATE="true"
 # Uncomment following line if you want to disable autosetting terminal title.
 # export DISABLE_AUTO_TITLE="true"
 
+# Uncomment following line if you want red dots to be displayed while waiting for completion
+COMPLETION_WAITING_DOTS="true"
+
 # Which plugins would you like to load? (plugins can be found in ~/.oh-my-zsh/plugins/*)
 # Example format: plugins=(rails git textmate ruby lighthouse)
 plugins=(git svn debian screen)