aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/beam/erl_thr_progress.c
diff options
context:
space:
mode:
authorHenrik Nord <[email protected]>2016-04-13 09:53:56 +0200
committerHenrik Nord <[email protected]>2016-04-13 09:53:56 +0200
commit08ab8c8534ecabb2797165f5508a8c42d4dae926 (patch)
treefb1d68ab6cdcdcc2e9db31aec3d0e3cff6c074c8 /erts/emulator/beam/erl_thr_progress.c
parent1579de1ff38471e70df20fcdd79c42c4a5a89a50 (diff)
parent6664eed554974336909d3ffe03f20349cc4c38fd (diff)
downloadotp-08ab8c8534ecabb2797165f5508a8c42d4dae926.tar.gz
otp-08ab8c8534ecabb2797165f5508a8c42d4dae926.tar.bz2
otp-08ab8c8534ecabb2797165f5508a8c42d4dae926.zip
Merge branch 'henrik/update-copyrightyear'
* henrik/update-copyrightyear: update copyright-year
Diffstat (limited to 'erts/emulator/beam/erl_thr_progress.c')
-rw-r--r--erts/emulator/beam/erl_thr_progress.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/beam/erl_thr_progress.c b/erts/emulator/beam/erl_thr_progress.c
index 7b06fd840f..542541165b 100644
--- a/erts/emulator/beam/erl_thr_progress.c
+++ b/erts/emulator/beam/erl_thr_progress.c
@@ -1,7 +1,7 @@
/*
* %CopyrightBegin%
*
- * Copyright Ericsson AB 2011-2013. All Rights Reserved.
+ * Copyright Ericsson AB 2011-2016. All Rights Reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.