diff options
author | Dan Gudmundsson <[email protected]> | 2016-12-07 15:05:52 +0100 |
---|---|---|
committer | Dan Gudmundsson <[email protected]> | 2016-12-07 15:05:52 +0100 |
commit | ba1d721c4af43a1c775ef83322105ab9c5d96265 (patch) | |
tree | 611aee45eb5782c286dddf2e78713295b048cf18 /erts/etc/unix | |
parent | b5545594dd90bb6d1e049757050839a368730ecb (diff) | |
parent | 3eddb0f762de248d3230b38bc9d478bfbc8e7331 (diff) | |
download | otp-ba1d721c4af43a1c775ef83322105ab9c5d96265.tar.gz otp-ba1d721c4af43a1c775ef83322105ab9c5d96265.tar.bz2 otp-ba1d721c4af43a1c775ef83322105ab9c5d96265.zip |
Merge branch 'maint'
* maint:
Update copyright-year
Conflicts:
lib/dialyzer/src/dialyzer.hrl
lib/dialyzer/src/dialyzer_options.erl
lib/dialyzer/test/opaque_SUITE_data/src/recrec/dialyzer.hrl
lib/dialyzer/test/opaque_SUITE_data/src/recrec/dialyzer_races.erl
lib/hipe/icode/hipe_icode.erl
lib/hipe/main/hipe.erl
lib/hipe/main/hipe.hrl.src
lib/hipe/main/hipe_main.erl
Diffstat (limited to 'erts/etc/unix')
-rw-r--r-- | erts/etc/unix/run_erl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/etc/unix/run_erl.c b/erts/etc/unix/run_erl.c index a997297f65..447720af7e 100644 --- a/erts/etc/unix/run_erl.c +++ b/erts/etc/unix/run_erl.c @@ -1,7 +1,7 @@ /* * %CopyrightBegin% * - * Copyright Ericsson AB 1996-2015. All Rights Reserved. + * Copyright Ericsson AB 1996-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. |