summaryrefslogtreecommitdiffstats
path: root/doc/python10
diff options
context:
space:
mode:
authorGary Oberbrunner <garyo@oberbrunner.com>2014-08-23 20:28:44 (GMT)
committerGary Oberbrunner <garyo@oberbrunner.com>2014-08-23 20:28:44 (GMT)
commita7d764ed831fa3243aa0bd3307f641e1e1f9f8a8 (patch)
tree0193d9406107790a66098254869e4b070aa6cacc /doc/python10
parenta6ea2d760464092ea91a0dd01ba6260288aa3587 (diff)
parent6db60dbe1c3dc28f24bfca48135bcb4bc9bd66d6 (diff)
downloadSCons-a7d764ed831fa3243aa0bd3307f641e1e1f9f8a8.zip
SCons-a7d764ed831fa3243aa0bd3307f641e1e1f9f8a8.tar.gz
SCons-a7d764ed831fa3243aa0bd3307f641e1e1f9f8a8.tar.bz2
Merged default branch into python3-port to keep it up to date.
Hand-updated a few things to keep them python3-safe, and handled several merge conflicts.
Diffstat (limited to 'doc/python10')
-rw-r--r--doc/python10/main.xml8
1 files changed, 4 insertions, 4 deletions
diff --git a/doc/python10/main.xml b/doc/python10/main.xml
index 6093852..a7732da 100644
--- a/doc/python10/main.xml
+++ b/doc/python10/main.xml
@@ -10,7 +10,7 @@
<article 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">
-
+
<!--
__COPYRIGHT__
@@ -35,7 +35,7 @@
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-->
-
+
<articleinfo>
<title>SCons Design and Implementation</title>
@@ -46,8 +46,8 @@
<copyright>
<year>2001</year>
- <year>2002</year>
- <holder>Steven Knight</holder>
+ <year>2014</year>
+ <holder>The SCons Foundation</holder>
</copyright>
<pubdate>2002</pubdate>