Merge back from checkpoint.
authorbdbaddog <bdbaddog@fdb21ef1-2011-0410-befe-b5e4ea1792b1>
Tue, 19 Jan 2010 05:59:03 +0000 (05:59 +0000)
committerbdbaddog <bdbaddog@fdb21ef1-2011-0410-befe-b5e4ea1792b1>
Tue, 19 Jan 2010 05:59:03 +0000 (05:59 +0000)
commit699ae9b4e931d17d21f6c445f6e93f3bb7c7e2b1
tree60cc1567364d74f85e24f866952e799167288f49
parentefda76574d97066161f2d63279a2151a6189ef46
Merge back from checkpoint.
Need to regenerate the .xml files.

git-svn-id: http://scons.tigris.org/svn/scons/trunk@4635 fdb21ef1-2011-0410-befe-b5e4ea1792b1
23 files changed:
Announcement.txt
QMTest/TestSCons.py
SConstruct
doc/user/add-method.xml
doc/user/alias.xml
doc/user/builders-built-in.xml
doc/user/builders-commands.xml
doc/user/builders-writing.xml
doc/user/builders.xml
doc/user/caching.xml
doc/user/command-line.xml
doc/user/depends.xml
doc/user/environments.xml
doc/user/less-simple.xml
doc/user/libraries.xml
doc/user/nodes.xml
doc/user/output.xml
doc/user/parseconfig.xml
doc/user/parseflags.xml
doc/user/simple.xml
doc/user/troubleshoot.xml
doc/user/variants.xml
src/RELEASE.txt