aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/utils/loaded
diff options
context:
space:
mode:
authorMicael Karlberg <[email protected]>2011-03-07 15:43:06 +0100
committerMicael Karlberg <[email protected]>2011-03-07 15:43:06 +0100
commit5c8338fcadd68589814a7098e001b036109c5ee7 (patch)
tree4a89c1feb52b8ec862cfa46c8b502ea3880217be /erts/emulator/utils/loaded
parentf39098ac6f487f7142e4597930ee3bb709362c4a (diff)
parentf85c79166c0fcf39eaab62e39f392aa7ce83c9bf (diff)
downloadotp-5c8338fcadd68589814a7098e001b036109c5ee7.tar.gz
otp-5c8338fcadd68589814a7098e001b036109c5ee7.tar.bz2
otp-5c8338fcadd68589814a7098e001b036109c5ee7.zip
Merge branch 'dev' into bmk/inets/httpd/dont_send_empty_chunk/OTP-9091
Diffstat (limited to 'erts/emulator/utils/loaded')
-rw-r--r--erts/emulator/utils/loaded2
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/utils/loaded b/erts/emulator/utils/loaded
index 99a66e7fdb..d124a64a78 100644
--- a/erts/emulator/utils/loaded
+++ b/erts/emulator/utils/loaded
@@ -2,7 +2,7 @@
%%
%% %CopyrightBegin%
%%
-%% Copyright Ericsson AB 1998-2010. All Rights Reserved.
+%% Copyright Ericsson AB 1998-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