diff options
| author | Sverker Eriksson <[email protected]> | 2017-02-03 17:01:52 +0100 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2017-02-03 17:01:52 +0100 |
| commit | 69b928b12d9206d00879c08e46143f599f9dc34e (patch) | |
| tree | fde8905a6ca71c797725a33895321c67e81c3645 /erts/emulator/nifs/common/erl_tracer_nif.c | |
| parent | 4b97d656a9e1774fd4ff984014f085ad661a4fdb (diff) | |
| parent | 1923315e618bea9fb23fc3237541f95a0accc266 (diff) | |
| download | otp-69b928b12d9206d00879c08e46143f599f9dc34e.tar.gz otp-69b928b12d9206d00879c08e46143f599f9dc34e.tar.bz2 otp-69b928b12d9206d00879c08e46143f599f9dc34e.zip | |
Merge branch 'master' into sverker/enif_select
Diffstat (limited to 'erts/emulator/nifs/common/erl_tracer_nif.c')
| -rw-r--r-- | erts/emulator/nifs/common/erl_tracer_nif.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/nifs/common/erl_tracer_nif.c b/erts/emulator/nifs/common/erl_tracer_nif.c index c0cc48ff42..0bde60d057 100644 --- a/erts/emulator/nifs/common/erl_tracer_nif.c +++ b/erts/emulator/nifs/common/erl_tracer_nif.c @@ -1,7 +1,7 @@ /* * %CopyrightBegin% * - * Copyright Ericsson 2015. All Rights Reserved. + * Copyright Ericsson 2015-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. |