Changeset 23a08aa0 for Jenkins/FullBuild


Ignore:
Timestamp:
Sep 19, 2022, 8:11:02 PM (3 years ago)
Author:
Peter A. Buhr <pabuhr@…>
Branches:
ADT, ast-experimental, master, pthread-emulation
Children:
aa9f215
Parents:
ebf8ca5 (diff), ae1d151 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

fix merge conflict

File:
1 edited

Legend:

Unmodified
Added
Removed

  • Jenkins/FullBuild

    rebf8ca5 r23a08aa0  
    1818
    1919                                parallel (
    20                                         // gcc_08_x86_new: { trigger_build( 'gcc-8',   'x86' ) },
    21                                         // gcc_07_x86_new: { trigger_build( 'gcc-7',   'x86' ) },
    22                                         // gcc_06_x86_new: { trigger_build( 'gcc-6',   'x86' ) },
     20                                        gcc_08_x86_new: { trigger_build( 'gcc-10',  'x86' ) },
     21                                        gcc_07_x86_new: { trigger_build( 'gcc-9',   'x86' ) },
    2322                                        gcc_10_x64_new: { trigger_build( 'gcc-10',  'x64' ) },
    2423                                        gcc_09_x64_new: { trigger_build( 'gcc-9',   'x64' ) },
Note: See TracChangeset for help on using the changeset viewer.