diff --git a/docs/dictionary/command/log.lcdoc b/docs/dictionary/command/log.lcdoc index 0bed4394a5c..28b0a227646 100644 --- a/docs/dictionary/command/log.lcdoc +++ b/docs/dictionary/command/log.lcdoc @@ -38,15 +38,16 @@ A comma separated list of expressions containing the arguments to send. Arrays are expressions and are valid to send as arguments. Description: -The command invokes the handler. When the is the -default value of `log` then the command behaves in the same way as any -other scripted handler. If the is set to empty then the -command does not invoke any handler or evaluate parameters, therefore, allowing -for many logs to be added to scripts for development and an easy low-cost method -to turn the logging off for a release build. The may be set to any -handler name, however, if the handler is not in the message path then use of the - command will throw a `can't find handler` error. - -References: log (command), put (command), msgChanged (message) +The command invokes the handler specified by the property. +When the is the default value of `log` then the command +behaves in the same way as any other scripted handler. If the is +set to empty then the command does not invoke any handler or evaluate +parameters, therefore, allowing for many logs to be added to scripts for +development and an easy low-cost method to turn the logging off for a release +build. The may be set to any handler name, however, if the +handler is not in the message path then use of the command will throw a +`can't find handler` error. + +References: put (command), msgChanged (message), logMessage (property) Tags: debugging diff --git a/docs/notes/bugfix-22278.md b/docs/notes/bugfix-22278.md new file mode 100644 index 00000000000..c2beb3fd451 --- /dev/null +++ b/docs/notes/bugfix-22278.md @@ -0,0 +1 @@ +# Corrected missing text issue in the documentation for the log command diff --git a/ide b/ide index 7979fcdf29f..5f188495990 160000 --- a/ide +++ b/ide @@ -1 +1 @@ -Subproject commit 7979fcdf29f91a3239aef140c5de5efc181f8b6a +Subproject commit 5f188495990dd6fca83752d1f7763c4c94db4bed diff --git a/revdb/revdb.gyp b/revdb/revdb.gyp index a516499b2a3..de38118299d 100644 --- a/revdb/revdb.gyp +++ b/revdb/revdb.gyp @@ -539,6 +539,10 @@ # Error in ../../thirdparty/libsqlite/include/qry_dat.h '-Werror=return-type', ], + 'defines': + [ + '_GLIBCXX_USE_CXX11_ABI=0', + ], }, ], [ @@ -652,6 +656,10 @@ '-lstdc++', '-Wl,-Bdynamic', ], + 'defines': + [ + '_GLIBCXX_USE_CXX11_ABI=0', + ], }, ], ], diff --git a/version b/version index 30cc6a8e470..8c62bfa1262 100644 --- a/version +++ b/version @@ -1,6 +1,6 @@ -BUILD_REVISION = 15504 +BUILD_REVISION = 15510 BUILD_MAJOR_VERSION = 9 -BUILD_MINOR_VERSION = 5 -BUILD_POINT_VERSION = 1 -BUILD_SHORT_VERSION = 9.5.1-rc-1 -BUILD_LONG_VERSION = 9.5.1.15504 (RC 1) +BUILD_MINOR_VERSION = 6 +BUILD_POINT_VERSION = 0 +BUILD_SHORT_VERSION = 9.6.0-dp-1 +BUILD_LONG_VERSION = 9.6.0.15510 (DP 1)