diff options
author | Micael Karlberg <[email protected]> | 2011-03-17 12:28:39 +0100 |
---|---|---|
committer | Micael Karlberg <[email protected]> | 2011-03-17 12:28:39 +0100 |
commit | b5aae77205c8081b79aa9ce1f1141f21f6e1fc2c (patch) | |
tree | d1bcdaaf38253733570660bf63183ca65bc454a9 /lib/common_test/priv | |
parent | a5d14f14e04ca7ca5fd34a7811cefbccdd024ce4 (diff) | |
parent | f861b4fdb3fd39e35f2951c53a73b30a98c7f973 (diff) | |
download | otp-b5aae77205c8081b79aa9ce1f1141f21f6e1fc2c.tar.gz otp-b5aae77205c8081b79aa9ce1f1141f21f6e1fc2c.tar.bz2 otp-b5aae77205c8081b79aa9ce1f1141f21f6e1fc2c.zip |
Merge branch 'dev' into bmk/inets/httpd/make_mod_esi_deliver_accept_binary_data/OTP-9123
Diffstat (limited to 'lib/common_test/priv')
-rw-r--r-- | lib/common_test/priv/Makefile.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/common_test/priv/Makefile.in b/lib/common_test/priv/Makefile.in index a6ac0f1a02..f4a0c181f9 100644 --- a/lib/common_test/priv/Makefile.in +++ b/lib/common_test/priv/Makefile.in @@ -1,7 +1,7 @@ # # %CopyrightBegin% # -# Copyright Ericsson AB 2003-2009. All Rights Reserved. +# Copyright Ericsson AB 2003-2011. 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 |