about summary refs log tree commit diff
path: root/ChangeLog
diff options
context:
space:
mode:
authorClint Adams <clint@users.sourceforge.net>2010-01-10 03:34:20 +0000
committerClint Adams <clint@users.sourceforge.net>2010-01-10 03:34:20 +0000
commitfd526797f2edb2a110f3299948f62eef8bc378de (patch)
tree3bfdefac9fdbb7504bab65f20aac7e13d06ceb6f /ChangeLog
parent8c60540ce6a2969878c8e172e0015d32e5a6ddc0 (diff)
downloadzsh-fd526797f2edb2a110f3299948f62eef8bc378de.tar.gz
zsh-fd526797f2edb2a110f3299948f62eef8bc378de.tar.xz
zsh-fd526797f2edb2a110f3299948f62eef8bc378de.zip
Frank Terbeck: 27586: more tmux completion support.
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog8
1 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index c01235c3b..2a786bc46 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-01-10  Clint Adams  <clint@zsh.org>
+
+	* Frank Terbeck: 27586: Completion/Unix/Command/_tmux:
+	more tmux completion support.
+
 2010-01-08  Peter Stephenson  <pws@csr.com>
 
 	* 27577: sergio: Functions/Misc/zcalc: vared -p obeys
@@ -28,7 +33,6 @@
 	* Jesse Weinstein: 27558: Completion/Unix/Command/_espeak:
 	completion for espeak.
 
->>>>>>> 1.4856
 2010-01-04  Peter Stephenson  <pws@csr.com>
 
 	* 27556: Src/lex.c: lexsave() should sanitize more variables else
@@ -12560,5 +12564,5 @@
 
 *****************************************************
 * This is used by the shell to define $ZSH_PATCHLEVEL
-* $Revision: 1.4857 $
+* $Revision: 1.4858 $
 *****************************************************