diff options
author | Björn-Egil Dahlberg <[email protected]> | 2016-05-23 14:19:16 +0200 |
---|---|---|
committer | Björn-Egil Dahlberg <[email protected]> | 2016-05-23 14:19:16 +0200 |
commit | 07aea2c4ef22eb5eb7205027665d65596828ec69 (patch) | |
tree | 3d9fa0ded3803cf516b95e02e83e37e9ebe0674a /make/otp_subdir.mk | |
parent | 84025f9d594e33b0f540ce47241ca6c6460070b0 (diff) | |
parent | 761b3bb5f48e5c9df401debc4e3cc63457410f2e (diff) | |
download | otp-07aea2c4ef22eb5eb7205027665d65596828ec69.tar.gz otp-07aea2c4ef22eb5eb7205027665d65596828ec69.tar.bz2 otp-07aea2c4ef22eb5eb7205027665d65596828ec69.zip |
Merge branch 'egil/erts/cuddle-lttng-tests'
* egil/erts/cuddle-lttng-tests:
erts: Check for carrier capability specifically in test
Diffstat (limited to 'make/otp_subdir.mk')
0 files changed, 0 insertions, 0 deletions