diff options
Diffstat (limited to 'README.rst')
| -rw-r--r-- | README.rst | 15 |
1 files changed, 15 insertions, 0 deletions
@@ -480,6 +480,16 @@ following packages will be built:: build/dist/scons-2.3.3-1.noarch.rpm build/dist/scons-2.3.3-1.src.rpm build/dist/scons-2.3.3.linux-i686.tar.gz +<<<<<<< HEAD + build/dist/scons-2.3.5.tar.gz + build/dist/scons-2.3.5.win32.exe + build/dist/scons-2.3.5.zip + build/dist/scons-doc-2.3.5.tar.gz + build/dist/scons-local-2.3.5.tar.gz + build/dist/scons-local-2.3.5.zip + build/dist/scons-src-2.3.5.tar.gz + build/dist/scons-src-2.3.5.zip +======= build/dist/scons-2.3.6.tar.gz build/dist/scons-2.3.6.win32.exe build/dist/scons-2.3.6.zip @@ -488,6 +498,7 @@ following packages will be built:: build/dist/scons-local-2.3.6.zip build/dist/scons-src-2.3.6.tar.gz build/dist/scons-src-2.3.6.zip +>>>>>>> upstream/2.3.6 build/dist/scons_2.3.3-1_all.deb The SConstruct file is supposed to be smart enough to avoid trying to build @@ -750,3 +761,7 @@ many contributors, including but not at all limited to: Copyright (c) 2001 - 2015 The SCons Foundation +<<<<<<< HEAD + +======= +>>>>>>> upstream/2.3.6 |