From 140d836e9cd54fb67b969fd82ef7ed19ba574d40 Mon Sep 17 00:00:00 2001
From: Luca Falavigna <dktrkranz@debian.org>
Date: Sat, 26 Apr 2014 15:11:58 +0200
Subject: Imported Upstream version 2.3.1

---
 doc/generated/examples/mergeflags_MergeFlags3_1.xml | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 doc/generated/examples/mergeflags_MergeFlags3_1.xml

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

diff --git a/doc/generated/examples/mergeflags_MergeFlags3_1.xml b/doc/generated/examples/mergeflags_MergeFlags3_1.xml
new file mode 100644
index 0000000..324d960
--- /dev/null
+++ b/doc/generated/examples/mergeflags_MergeFlags3_1.xml
@@ -0,0 +1,6 @@
+<?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</userinput>
+['-option', '-O1', '-whatever', '-O3']
+['/include', '/usr/local/include', '/usr/include', '/usr/opt/include']
+scons: `.' is up to date.
+</screen>
-- 
cgit v1.2.3