aboutsummaryrefslogtreecommitdiffstats
path: root/lib/inets/test/Makefile
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2014-03-21 15:23:22 +0100
committerIngela Anderton Andin <[email protected]>2014-03-21 15:23:22 +0100
commitbbe92ec2c359373205149dabc61ef0d50784760f (patch)
tree676f4e5ef29372ae03177015ac5854a99e4982e6 /lib/inets/test/Makefile
parent425a75a11ea58125b67ad56f4ed3ca65370a3e72 (diff)
parent57f446a999b01dcda42459d2f9f4e6b87d50a128 (diff)
downloadotp-bbe92ec2c359373205149dabc61ef0d50784760f.tar.gz
otp-bbe92ec2c359373205149dabc61ef0d50784760f.tar.bz2
otp-bbe92ec2c359373205149dabc61ef0d50784760f.zip
Merge branch 'ia/inets/revert/OTP-11756'
* ia/inets/revert/OTP-11756: inets: Continue CTify test suite inets: Enable https tests inets: Make test suites independent of each other inets: Reverted commmit f97cd6965ac35d1cbe510de23592956857d144c8
Diffstat (limited to 'lib/inets/test/Makefile')
-rw-r--r--lib/inets/test/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/inets/test/Makefile b/lib/inets/test/Makefile
index c156b34406..609396273d 100644
--- a/lib/inets/test/Makefile
+++ b/lib/inets/test/Makefile
@@ -1,7 +1,7 @@
#
# %CopyrightBegin%
#
-# Copyright Ericsson AB 1997-2013. All Rights Reserved.
+# Copyright Ericsson AB 1997-2014. All Rights Reserved.
#
# The contents of this file are subject to the Erlang Public License,
# Version 1.1, (the "License"); you may not use this file except in