aboutsummaryrefslogtreecommitdiffstats
path: root/lib/os_mon
diff options
context:
space:
mode:
authorBjörn-Egil Dahlberg <[email protected]>2011-09-29 18:12:11 +0200
committerBjörn-Egil Dahlberg <[email protected]>2011-09-29 18:12:11 +0200
commit622daf3b96666f8bbabec44a15b26a188a83b95e (patch)
tree706377087e70525e9bdc68b2f98911d56b915e5d /lib/os_mon
parent09c46998b3a4b0060b3ff3799c142d564f91f517 (diff)
parent5acac472723ef5cac6a944caf7b7ec4320c003e9 (diff)
downloadotp-622daf3b96666f8bbabec44a15b26a188a83b95e.tar.gz
otp-622daf3b96666f8bbabec44a15b26a188a83b95e.tar.bz2
otp-622daf3b96666f8bbabec44a15b26a188a83b95e.zip
Merge branch 'dev' into major
* dev: Update copyright years
Diffstat (limited to 'lib/os_mon')
-rw-r--r--lib/os_mon/c_src/cpu_sup.c2
-rw-r--r--lib/os_mon/doc/src/notes.xml2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/os_mon/c_src/cpu_sup.c b/lib/os_mon/c_src/cpu_sup.c
index e3bdbd1489..9c5f9a6aa5 100644
--- a/lib/os_mon/c_src/cpu_sup.c
+++ b/lib/os_mon/c_src/cpu_sup.c
@@ -1,7 +1,7 @@
/*
* %CopyrightBegin%
*
- * Copyright Ericsson AB 1997-2009. All Rights Reserved.
+ * Copyright Ericsson AB 1997-2011. 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
diff --git a/lib/os_mon/doc/src/notes.xml b/lib/os_mon/doc/src/notes.xml
index 3b5dbe3146..0a088ca8b6 100644
--- a/lib/os_mon/doc/src/notes.xml
+++ b/lib/os_mon/doc/src/notes.xml
@@ -4,7 +4,7 @@
<chapter>
<header>
<copyright>
- <year>2004</year><year>2010</year>
+ <year>2004</year><year>2011</year>
<holder>Ericsson AB. All Rights Reserved.</holder>
</copyright>
<legalnotice>