Mercurial > octave-antonio

diff scripts/ChangeLog @ 6688:b26a8e0e42cd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 2007-06-04 06:25:21 by jwe]
author jwe
date Mon, 04 Jun 2007 06:25:21 +0000
parents 44ebfc8c4ff0
children 8e0444d90050
line wrap: on
line diff
--- a/scripts/ChangeLog	Sun Jun 03 22:17:01 2007 +0000
+++ b/scripts/ChangeLog	Mon Jun 04 06:25:21 2007 +0000
@@ -1,8 +1,17 @@
+<<<<<<< ChangeLog
+<<<<<<< ChangeLog
+2007-06-03  Søren Hauberg  <soren@hauberg.org>
+
+	* plot/axes.m: Eliminate redundant else clause.
+
+=======
+=======
 2007-06-03  David Bateman  <dbateman@free.fr>
 
 	* polynomial/spline.m: Add a small tolerance to spline tests.
 	* pkg/pkg.m: Protect against multiple actions being define.
 	
+>>>>>>> 1.846
 2007-06-01  David Bateman  <dbateman@free.fr>
 
 	* pkg.m (pkg:is_superuser): Remove function used in one place and
@@ -10,6 +19,7 @@
 	(pkg:install): Check for existence of files to install before
 	globbing and warn the user if they don't exist.
 
+>>>>>>> 1.844
 2007-05-31  David Bateman  <dbateman@free.fr>
 
 	* miscellaneous/copyfile.m: Split copying of multiple files to a