Merge tag 'upstream/2.3.1'

Upstream version 2.3.1

1 files changed, 26 insertions, 0 deletions

diff --git a/doc/generated/examples/troubleshoot_tree1_6.xml b/doc/generated/examples/troubleshoot_tree1_6.xml
new file mode 100644
index 0000000..4d3c972
--- /dev/null
+++ b/doc/generated/examples/troubleshoot_tree1_6.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<screen xmlns="http://www.scons.org/dbxsd/v1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.scons.org/dbxsd/v1.0/scons.xsd scons.xsd">% <userinput>scons -Q --tree=derived,status</userinput>
+cc -o f1.o -c -I. f1.c
+cc -o f2.o -c -I. f2.c
+cc -o f3.o -c -I. f3.c
+cc -o prog f1.o f2.o f3.o
+ E         = exists
+  R        = exists in repository only
+   b       = implicit builder
+   B       = explicit builder
+    S      = side effect
+     P     = precious
+      A    = always build
+       C   = current
+        N  = no clean
+         H = no cache
+
+[E b      ]+-.
+[E B   C  ]  +-f1.o
+[E B   C  ]  +-f2.o
+[E B   C  ]  +-f3.o
+[E B   C  ]  +-prog
+[E B   C  ]    +-f1.o
+[E B   C  ]    +-f2.o
+[E B   C  ]    +-f3.o
+</screen>