diff options
author | Marcus Arendt <[email protected]> | 2014-08-08 15:02:29 +0200 |
---|---|---|
committer | Marcus Arendt <[email protected]> | 2014-08-08 15:02:29 +0200 |
commit | e189bae81fbc873d3349b9dec12ef234daf9d8ad (patch) | |
tree | 52d2791377955057c44fad4d0479439c900b9c77 /lib/orber/test/Makefile | |
parent | 2525622c384b27581c4b4cb158fc951f15ac5ca3 (diff) | |
parent | c472c3f5aafc81a409d0443c4601de43bafb53cb (diff) | |
download | otp-e189bae81fbc873d3349b9dec12ef234daf9d8ad.tar.gz otp-e189bae81fbc873d3349b9dec12ef234daf9d8ad.tar.bz2 otp-e189bae81fbc873d3349b9dec12ef234daf9d8ad.zip |
Merge branch 'maint-17' into maint
Diffstat (limited to 'lib/orber/test/Makefile')
-rw-r--r-- | lib/orber/test/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/orber/test/Makefile b/lib/orber/test/Makefile index 2f8777c773..50be14c24a 100644 --- a/lib/orber/test/Makefile +++ b/lib/orber/test/Makefile @@ -73,7 +73,8 @@ MODULES = \ orber_firewall_ipv6_in_SUITE \ orber_firewall_ipv4_out_SUITE \ orber_firewall_ipv6_out_SUITE \ - orber_nat_SUITE + orber_nat_SUITE \ + ip_v4v6_interop_SUITE GEN_MOD_ORBER = \ oe_orber_test \ |