diff options
author | Björn-Egil Dahlberg <[email protected]> | 2013-06-12 19:48:36 +0200 |
---|---|---|
committer | Björn-Egil Dahlberg <[email protected]> | 2013-06-12 19:48:36 +0200 |
commit | 473d202ee0b859518e6bc4bfa6c74e7e0863ca12 (patch) | |
tree | 689908bd116af888e4ed7659da9b7c4af9ba4c7d /erts/emulator/beam/erl_thr_progress.h | |
parent | 7b9f93973c877af5be57add78bc0d00321ed5931 (diff) | |
parent | 710b07ca18417976459335a8b0b81a6f6aa82699 (diff) | |
download | otp-473d202ee0b859518e6bc4bfa6c74e7e0863ca12.tar.gz otp-473d202ee0b859518e6bc4bfa6c74e7e0863ca12.tar.bz2 otp-473d202ee0b859518e6bc4bfa6c74e7e0863ca12.zip |
Merge branch 'maint'
Diffstat (limited to 'erts/emulator/beam/erl_thr_progress.h')
-rw-r--r-- | erts/emulator/beam/erl_thr_progress.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/beam/erl_thr_progress.h b/erts/emulator/beam/erl_thr_progress.h index 1aeecf2b06..5f392944c2 100644 --- a/erts/emulator/beam/erl_thr_progress.h +++ b/erts/emulator/beam/erl_thr_progress.h @@ -1,7 +1,7 @@ /* * %CopyrightBegin% * - * Copyright Ericsson AB 2011-2012. All Rights Reserved. + * Copyright Ericsson AB 2011-2013. 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 |