# HG changeset patch
# User Rik <octave@nomad.inbox5.com>
# Date 1295044395 28800
# Node ID 199543df2ece1587b51548a2226f51af1796a176
# Parent  06c80c90a2466ba904ba9aeef113296d6726662b
Delete unimplemented, now obsolete Matlab-compatability function flops.m

diff -r 06c80c90a246 -r 199543df2ece scripts/ChangeLog
--- a/scripts/ChangeLog	Fri Jan 14 14:21:23 2011 -0800
+++ b/scripts/ChangeLog	Fri Jan 14 14:33:15 2011 -0800
@@ -1,3 +1,8 @@
+2011-01-14  Rik  <octave@nomad.inbox5.com>
+
+	* miscellaneous/flops.m: Delete function which was unimplemented
+	in Octave and has been removed from Matlab since version 5.
+
 2011-01-14  Rik  <octave@nomad.inbox5.com>
 
 	* specfun/nthroot.m: Add Seealso references to docstring.
diff -r 06c80c90a246 -r 199543df2ece scripts/miscellaneous/flops.m
--- a/scripts/miscellaneous/flops.m	Fri Jan 14 14:21:23 2011 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +0,0 @@
-## Copyright (C) 1996-2011 John W. Eaton
-##
-## This file is part of Octave.
-##
-## Octave is free software; you can redistribute it and/or modify it
-## under the terms of the GNU General Public License as published by
-## the Free Software Foundation; either version 3 of the License, or (at
-## your option) any later version.
-##
-## Octave is distributed in the hope that it will be useful, but
-## WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-## General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License
-## along with Octave; see the file COPYING.  If not, see
-## <http://www.gnu.org/licenses/>.
-
-## -*- texinfo -*-
-## @deftypefn {Function File} {} flops ()
-## This function is provided for @sc{matlab} compatibility, but it doesn't
-## actually do anything.
-## @end deftypefn
-
-## Author: jwe
-
-function retval = flops ()
-
-  if (nargin > 1)
-    print_usage ();
-  endif
-
-  warning ("flops is a flop, always returning zero");
-
-  retval = 0;
-
-endfunction
diff -r 06c80c90a246 -r 199543df2ece scripts/miscellaneous/module.mk
--- a/scripts/miscellaneous/module.mk	Fri Jan 14 14:21:23 2011 -0800
+++ b/scripts/miscellaneous/module.mk	Fri Jan 14 14:33:15 2011 -0800
@@ -22,7 +22,6 @@
   miscellaneous/edit.m \
   miscellaneous/fileattrib.m \
   miscellaneous/fileparts.m \
-  miscellaneous/flops.m \
   miscellaneous/fullfile.m \
   miscellaneous/getappdata.m \
   miscellaneous/getfield.m \