aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/beam/erl_alloc_util.c
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/beam/erl_alloc_util.c
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/beam/erl_alloc_util.c')
-rw-r--r--erts/emulator/beam/erl_alloc_util.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/beam/erl_alloc_util.c b/erts/emulator/beam/erl_alloc_util.c
index c09f0bbd77..1394b7e829 100644
--- a/erts/emulator/beam/erl_alloc_util.c
+++ b/erts/emulator/beam/erl_alloc_util.c
@@ -1,7 +1,7 @@
/*
* %CopyrightBegin%
*
- * Copyright Ericsson AB 2002-2010. All Rights Reserved.
+ * Copyright Ericsson AB 2002-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