Mercurial > forge

changeset 1240:a4fd2e3c9e96 octave-forge

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Undo nargin conflicts
author pkienzle
date Wed, 28 Jan 2004 22:38:27 +0000
parents 68c2b06beacb
children a54d2a8ea2e9
files main/vrml/vrml_frame.m main/vrml/vrml_lines.m main/vrml/vrml_points.m
diffstat 3 files changed, 0 insertions(+), 17 deletions(-) [+]
line wrap: on
line diff
--- a/main/vrml/vrml_frame.m	Wed Jan 28 22:19:34 2004 +0000
+++ b/main/vrml/vrml_frame.m	Wed Jan 28 22:38:27 2004 +0000
@@ -33,14 +33,8 @@
 ######################################################################
 ## Read options
 numeric_args = 0;
-<<<<<<< vrml_frame.m
-nargin = nargin();
-
-while nargin && numeric_args<2,
-=======
 args = nargin; # nargin is now a function
 while args && numeric_args<2,
->>>>>>> 1.8
 
 
   tmp = nth (varargin, numeric_args + 1);
--- a/main/vrml/vrml_lines.m	Wed Jan 28 22:19:34 2004 +0000
+++ b/main/vrml/vrml_lines.m	Wed Jan 28 22:38:27 2004 +0000
@@ -27,12 +27,7 @@
 
 verbose = 0 ;
 
-<<<<<<< vrml_lines.m
-nargin = nargin();
-nargin -= 2 ;
-=======
 args -= 2 ;
->>>>>>> 1.4
 i=1;
 
 while args>=i ,
--- a/main/vrml/vrml_points.m	Wed Jan 28 22:19:34 2004 +0000
+++ b/main/vrml/vrml_points.m	Wed Jan 28 22:38:27 2004 +0000
@@ -49,13 +49,7 @@
 emit = 1;
 tran = 0;
 
-<<<<<<< vrml_points.m
-nargin = nargin();
-i = 1; nargin--;
-=======
 i = 1; 			# pos 2.1.39
->>>>>>> 1.8
-
 
 while i <= nargin-1