diff doc/ChangeLog @ 11552:6b6e9051ecb8

Add merge/ifelse function to documentation.
author Rik <octave@nomad.inbox5.com>
date Sat, 15 Jan 2011 15:13:06 -0800
parents e1851653d59c
children 1811f4f8b3b5
line wrap: on
line diff
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,6 +1,10 @@
 2011-01-15  Rik  <octave@nomad.inbox5.com>
 
-	* doc/interpreter/func.txi, doc/interpreter/intro.txi: Eliminate
+	* interpreter/expr.txi: Add merge/ifelse function to documentation.
+
+2011-01-15  Rik  <octave@nomad.inbox5.com>
+
+	* interpreter/func.txi, interpreter/intro.txi: Eliminate
 	@deffn macros.
 
 2011-01-15  Rik  <octave@nomad.inbox5.com>