Mercurial > octave
changeset 33072:e4ab79d5b849
maint: merge stable to default
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Thu, 22 Feb 2024 13:27:40 -0500 |
| parents | 764a8eee1383 (current diff) df46c4d6e113 (diff) |
| children | 88e9e13db007 e073e676c416 |
| files | |
| diffstat | 2 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/doc/doxyhtml/Doxyfile.in Wed Feb 21 20:05:24 2024 -0500 +++ b/doc/doxyhtml/Doxyfile.in Thu Feb 22 13:27:40 2024 -0500 @@ -76,7 +76,7 @@ # pixels and the maximum width should not exceed 200 pixels. Doxygen will copy # the logo to the output directory. -PROJECT_LOGO = @abs_top_builddir@/etc/icons/octave-logo-48.png +PROJECT_LOGO = @abs_top_srcdir@/etc/icons/octave-logo-48.png # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path # into which the generated documentation will be written. If a relative path is
--- a/libgui/src/gui-settings.h Wed Feb 21 20:05:24 2024 -0500 +++ b/libgui/src/gui-settings.h Thu Feb 22 13:27:40 2024 -0500 @@ -115,14 +115,14 @@ uint uint_value (const gui_pref& pref) const; /*! - Reading a color from the given QVaraitn @p def taking different + Reading a color from the given QVariant @p def taking different color modes into account. The default value for a second color mode @p mode=1 is deterimined from the standard default value @p mode=0 by inverting the lightness \f{eqnarray*}{ H_1 &=& H_0\\ S_1 &=& S_0\\ - L_1 &=& 1.0 - 0.85 L_0 L_0 > 0.3 + L_1 &=& 1.0 - 0.85 L_0 L_0 > 0.3\\ L_1 &=& 1.0 - 0.70 L_0 L_0 < 0.3 \f}