Mercurial > octave
changeset 24931:ecb5688b875f
maint: merge stable to default.
| author | Rik <rik@octave.org> |
|---|---|
| date | Mon, 19 Mar 2018 14:38:04 -0700 |
| parents | f38ac278ff7d (current diff) 16155531bda4 (diff) |
| children | cc55705f1f84 |
| files | |
| diffstat | 4 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/scripts/image/imwrite.m Mon Mar 19 13:50:10 2018 -0700 +++ b/scripts/image/imwrite.m Mon Mar 19 14:38:04 2018 -0700 @@ -209,7 +209,7 @@ %! [g] = write_and_read (".jpeg", gray, "quality", 100); %! assert (g, gray); -%!function [compression] = get_bmp_compression (ext, cmap = [], varargin) +%!function compression = get_bmp_compression (ext, cmap = [], varargin) %! gray = repmat (uint8 (0:255), 100, 1); %! filename = [tempname() ext]; %! unwind_protect
--- a/scripts/miscellaneous/edit.m Mon Mar 19 13:50:10 2018 -0700 +++ b/scripts/miscellaneous/edit.m Mon Mar 19 14:38:04 2018 -0700 @@ -493,7 +493,7 @@ if (any (exists == [2, 103])) body = type (name){1}; else - body = ["function [retval] = " basename " (input1, input2)\n\n" ... + body = ["function retval = " basename " (input1, input2)\n\n" ... "endfunction\n"]; endif if (isempty (head))
--- a/scripts/miscellaneous/mkdir.m Mon Mar 19 13:50:10 2018 -0700 +++ b/scripts/miscellaneous/mkdir.m Mon Mar 19 14:38:04 2018 -0700 @@ -1,7 +1,7 @@ ## Copyright (C) 2016-2017 Lachlan Andrew ## Copyright (C) 2012 Carnë Draug ## -## This program is free software: you can redistribute it and/or modify it +## 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.
--- a/scripts/pkg/private/get_description.m Mon Mar 19 13:50:10 2018 -0700 +++ b/scripts/pkg/private/get_description.m Mon Mar 19 14:38:04 2018 -0700 @@ -137,7 +137,7 @@ endfunction -function [valid] = is_valid_pkg_version_string (str) +function valid = is_valid_pkg_version_string (str) ## We are limiting ourselves to this set of characters because the ## version will appear on the filepath. The portable character, according to ## http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap03.html#tag_03_278