aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/beam/erl_trace.c
diff options
context:
space:
mode:
authorBjörn-Egil Dahlberg <[email protected]>2013-06-12 19:48:36 +0200
committerBjörn-Egil Dahlberg <[email protected]>2013-06-12 19:48:36 +0200
commit473d202ee0b859518e6bc4bfa6c74e7e0863ca12 (patch)
tree689908bd116af888e4ed7659da9b7c4af9ba4c7d /erts/emulator/beam/erl_trace.c
parent7b9f93973c877af5be57add78bc0d00321ed5931 (diff)
parent710b07ca18417976459335a8b0b81a6f6aa82699 (diff)
downloadotp-473d202ee0b859518e6bc4bfa6c74e7e0863ca12.tar.gz
otp-473d202ee0b859518e6bc4bfa6c74e7e0863ca12.tar.bz2
otp-473d202ee0b859518e6bc4bfa6c74e7e0863ca12.zip
Merge branch 'maint'
Diffstat (limited to 'erts/emulator/beam/erl_trace.c')
-rw-r--r--erts/emulator/beam/erl_trace.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/beam/erl_trace.c b/erts/emulator/beam/erl_trace.c
index bb6ed44523..fa015ee4b9 100644
--- a/erts/emulator/beam/erl_trace.c
+++ b/erts/emulator/beam/erl_trace.c
@@ -1,7 +1,7 @@
/*
* %CopyrightBegin%
*
- * Copyright Ericsson AB 1999-2012. All Rights Reserved.
+ * Copyright Ericsson AB 1999-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