diff options
| author | Björn-Egil Dahlberg <[email protected]> | 2012-11-23 15:42:31 +0100 |
|---|---|---|
| committer | Björn-Egil Dahlberg <[email protected]> | 2012-11-23 15:42:31 +0100 |
| commit | dd21aa5ac26ac4b09c31ac0390f0b596fa10e4e8 (patch) | |
| tree | 34db633841db4d5d9ec41ee198823292a711e7a4 /erts/emulator/beam | |
| parent | 0dc1b3b039628cb154fa04dd06b0a138f95b6e7e (diff) | |
| parent | 0534391319767818b036dbce212610a7372da692 (diff) | |
| download | otp-dd21aa5ac26ac4b09c31ac0390f0b596fa10e4e8.tar.gz otp-dd21aa5ac26ac4b09c31ac0390f0b596fa10e4e8.tar.bz2 otp-dd21aa5ac26ac4b09c31ac0390f0b596fa10e4e8.zip | |
Merge branch 'maint'
Diffstat (limited to 'erts/emulator/beam')
| -rw-r--r-- | erts/emulator/beam/erl_lock_check.h | 2 | ||||
| -rw-r--r-- | erts/emulator/beam/index.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/erts/emulator/beam/erl_lock_check.h b/erts/emulator/beam/erl_lock_check.h index b1eab315db..df7b3758e1 100644 --- a/erts/emulator/beam/erl_lock_check.h +++ b/erts/emulator/beam/erl_lock_check.h @@ -1,7 +1,7 @@ /* * %CopyrightBegin% * - * Copyright Ericsson AB 2005-2011. All Rights Reserved. + * Copyright Ericsson AB 2005-2012. 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 diff --git a/erts/emulator/beam/index.c b/erts/emulator/beam/index.c index c981a0a55e..79c3ecf1b3 100644 --- a/erts/emulator/beam/index.c +++ b/erts/emulator/beam/index.c @@ -1,7 +1,7 @@ /* * %CopyrightBegin% * - * Copyright Ericsson AB 1996-2009. All Rights Reserved. + * Copyright Ericsson AB 1996-2012. 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 |