about summary refs log tree commit diff
path: root/ChangeLog
diff options
context:
space:
mode:
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog5
1 files changed, 4 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index d9fce4c4f..2a50ce768 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2009-04-29  Peter Stephenson  <pws@csr.com>
 
+	* 26900: Benjamin R. Haskell: Completion/Unix/Command/_ssh: ssh -Y,
+	-x and -X are mutually exclusive.
+
 	* 26899: Ingmar Vanhassel: Completion/Unix/Command/_ssh: -Y option
 
 	* 26898: Ingmar Vanhassel: configure.ac: don't link
@@ -11636,5 +11639,5 @@
 
 *****************************************************
 * This is used by the shell to define $ZSH_PATCHLEVEL
-* $Revision: 1.4672 $
+* $Revision: 1.4673 $
 *****************************************************