From: erluk <erluk@fdb21ef1-2011-0410-befe-b5e4ea1792b1>
Date: Wed, 20 May 2009 07:17:52 +0000 (+0000)
Subject: - Initialized merge tracking from branches/installer via svn-1.5's merge command
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6698a43bb85d33ad702b93ff8198a1c539f763e9;p=scons.git

- Initialized merge tracking from branches/installer via svn-1.5's merge command

git-svn-id: http://scons.tigris.org/svn/scons/trunk@4210 fdb21ef1-2011-0410-befe-b5e4ea1792b1
---