Merge tag 'upstream/2.5.1+repack'

Upstream version 2.5.1+repack

1 files changed, 1 insertions, 5 deletions

diff --git a/doc/generated/examples/troubleshoot_Dump_2.xml b/doc/generated/examples/troubleshoot_Dump_2.xml
index a621422..d6fa404 100644
--- a/doc/generated/examples/troubleshoot_Dump_2.xml
+++ b/doc/generated/examples/troubleshoot_Dump_2.xml
@@ -71,7 +71,7 @@ scons: Reading SConscript files ...
   'RCFLAGS': [],
   'RCSUFFIXES': ['.rc', '.rc2'],
   'RDirs': <SCons.Defaults.Variable_Method_Caller object at 0x700000>,
-  'SCANNERS': [<SCons.Scanner.Base object at 0x700000>],
+  'SCANNERS': [],
   'SHCC': '$CC',
   'SHCCCOM': <SCons.Action.FunctionAction object at 0x700000>,
   'SHCCFLAGS': ['$CCFLAGS'],
@@ -97,10 +97,6 @@ scons: Reading SConscript files ...
   '_LIBDIRFLAGS': '$( ${_concat(LIBDIRPREFIX, LIBPATH, LIBDIRSUFFIX, __env__, RDirs, TARGET, SOURCE)} $)',
   '_LIBFLAGS': '${_concat(LIBLINKPREFIX, LIBS, LIBLINKSUFFIX, __env__)}',
   '_MSVC_OUTPUT_FLAG': <function msvc_output_flag at 0x700000>,
-  '__DSHLIBVERSIONFLAGS': '${__libversionflags(__env__,"DSHLIBVERSION","_DSHLIBVERSIONFLAGS")}',
-  '__LDMODULEVERSIONFLAGS': '${__libversionflags(__env__,"LDMODULEVERSION","_LDMODULEVERSIONFLAGS")}',
-  '__SHLIBVERSIONFLAGS': '${__libversionflags(__env__,"SHLIBVERSION","_SHLIBVERSIONFLAGS")}',
-  '__libversionflags': <function __libversionflags at 0x700000>,
   '_concat': <function _concat at 0x700000>,
   '_defines': <function _defines at 0x700000>,
   '_stripixes': <function _stripixes at 0x700000>}