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 /lib/os_mon/src | |
| parent | 9af01a23d3bf18366d3d2246ee0e9bf03f6dcfc1 (diff) | |
| parent | ce4431b33d18c04f4166def737b2aed582e4426a (diff) | |
| download | otp-4ba372e01009c36a9fea40a5d8b3c8e85284d102.tar.gz otp-4ba372e01009c36a9fea40a5d8b3c8e85284d102.tar.bz2 otp-4ba372e01009c36a9fea40a5d8b3c8e85284d102.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib/os_mon/src')
| -rw-r--r-- | lib/os_mon/src/memsup.erl | 2 | ||||
| -rw-r--r-- | lib/os_mon/src/os_mon_sysinfo.erl | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/os_mon/src/memsup.erl b/lib/os_mon/src/memsup.erl index 49533da1f7..5ef240f128 100644 --- a/lib/os_mon/src/memsup.erl +++ b/lib/os_mon/src/memsup.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1996-2011. All Rights Reserved. +%% Copyright Ericsson AB 1996-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 diff --git a/lib/os_mon/src/os_mon_sysinfo.erl b/lib/os_mon/src/os_mon_sysinfo.erl index 080885d5d6..fb732d1e3a 100644 --- a/lib/os_mon/src/os_mon_sysinfo.erl +++ b/lib/os_mon/src/os_mon_sysinfo.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1997-2011. All Rights Reserved. +%% Copyright Ericsson AB 1997-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 |