diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2015-08-02 11:55:56 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2015-08-02 11:55:56 +0200 |
| commit | 374b1f7583ad25bca0b801dd046ce8bfebd53bb0 (patch) | |
| tree | 68cb00322f3bb815eb14c711f71eae2ff52e9ba0 /README.rst | |
| parent | 7d409cbdf931289f934901eddd380e9e91734a54 (diff) | |
| parent | 4112d19049e27162c333bac13d908f48a4cc438a (diff) | |
merge brocken gbp import-orig
Diffstat (limited to 'README.rst')
| -rw-r--r-- | README.rst | 14 |
1 files changed, 14 insertions, 0 deletions
@@ -480,6 +480,7 @@ 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 @@ -488,6 +489,16 @@ following packages will be built:: 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 + build/dist/scons-doc-2.3.6.tar.gz + build/dist/scons-local-2.3.6.tar.gz + 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,4 +761,7 @@ many contributors, including but not at all limited to: Copyright (c) 2001 - 2015 The SCons Foundation +<<<<<<< HEAD +======= +>>>>>>> upstream/2.3.6 |