From baee03c569c91b745a1e025660b19a718db16e7d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= <debian@jff-webhosting.net>
Date: Thu, 28 Sep 2017 12:18:58 +0200
Subject: New upstream version 3.0.0

---
 doc/generated/examples/mergeflags_MergeFlags1_1.xml | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'doc/generated/examples/mergeflags_MergeFlags1_1.xml')

diff --git a/doc/generated/examples/mergeflags_MergeFlags1_1.xml b/doc/generated/examples/mergeflags_MergeFlags1_1.xml
index 8f18fd8..8a0c336 100644
--- a/doc/generated/examples/mergeflags_MergeFlags1_1.xml
+++ b/doc/generated/examples/mergeflags_MergeFlags1_1.xml
@@ -1,5 +1,10 @@
 <?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 http://www.scons.org/dbxsd/v1.0/scons.xsd">% <userinput>scons -Q</userinput>
-['-option', '-O1', '-whatever', '-O3']
-scons: `.' is up to date.
+  File "/home/my/project/SConstruct", line 5
+
+    print env['CCFLAGS']
+
+            ^
+
+SyntaxError: invalid syntax
 </screen>
-- 
cgit v1.2.3