Changeset bc73be3 in mainline for tools/travis.sh


Ignore:
Timestamp:
2019-06-27T08:51:20Z (6 years ago)
Author:
Jaroslav Jindrak <dzejrou@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
8add15e0
Parents:
ad40b74b (diff), aeba767 (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:

cpp: merge and resolve conflicts

File:
1 edited

Legend:

Unmodified
Added
Removed

  • tools/travis.sh

    rad40b74b rbc73be3  
    5252arm32/integratorcp:arm-helenos:image.boot
    5353arm32/raspberrypi:arm-helenos:uImage.bin
     54arm64/virt:aarch64-helenos:image.iso
    5455ia32:i686-helenos:image.iso
    5556ia64/i460GX:ia64-helenos:image.boot
Note: See TracChangeset for help on using the changeset viewer.