diff options
author | Björn-Egil Dahlberg <[email protected]> | 2012-03-30 14:53:37 +0200 |
---|---|---|
committer | Björn-Egil Dahlberg <[email protected]> | 2012-03-30 14:53:37 +0200 |
commit | 4ba372e01009c36a9fea40a5d8b3c8e85284d102 (patch) | |
tree | 488a6c5701f57793fb852a40733dfbe68aabe920 /erts/emulator/beam/erl_trace.c | |
parent | 9af01a23d3bf18366d3d2246ee0e9bf03f6dcfc1 (diff) | |
parent | ce4431b33d18c04f4166def737b2aed582e4426a (diff) | |
download | otp-4ba372e01009c36a9fea40a5d8b3c8e85284d102.tar.gz otp-4ba372e01009c36a9fea40a5d8b3c8e85284d102.tar.bz2 otp-4ba372e01009c36a9fea40a5d8b3c8e85284d102.zip |
Merge branch 'maint'
Diffstat (limited to 'erts/emulator/beam/erl_trace.c')
-rw-r--r-- | erts/emulator/beam/erl_trace.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/beam/erl_trace.c b/erts/emulator/beam/erl_trace.c index 4261cd03be..009ca1eb52 100644 --- a/erts/emulator/beam/erl_trace.c +++ b/erts/emulator/beam/erl_trace.c @@ -1,7 +1,7 @@ /* * %CopyrightBegin% * - * Copyright Ericsson AB 1999-2011. All Rights Reserved. + * Copyright Ericsson AB 1999-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 |