diff options
| author | Anders Svensson <[email protected]> | 2011-06-27 16:43:37 +0200 |
|---|---|---|
| committer | Anders Svensson <[email protected]> | 2011-06-27 16:43:37 +0200 |
| commit | bd6666300edb76e09c07508e3513f7bdde985b43 (patch) | |
| tree | 1e735ae4a1ab2b63597f43ec342cefcd77513563 /lib/snmp/src/agent/snmpa_conf.erl | |
| parent | 916e80959746c467ff858538e35f3c0105dbbced (diff) | |
| parent | 1049243404cc52cad5ce1f1d2d37383a2ca06160 (diff) | |
| download | otp-bd6666300edb76e09c07508e3513f7bdde985b43.tar.gz otp-bd6666300edb76e09c07508e3513f7bdde985b43.tar.bz2 otp-bd6666300edb76e09c07508e3513f7bdde985b43.zip | |
Merge remote branch 'upstream/dev' into dev
Diffstat (limited to 'lib/snmp/src/agent/snmpa_conf.erl')
| -rw-r--r-- | lib/snmp/src/agent/snmpa_conf.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/snmp/src/agent/snmpa_conf.erl b/lib/snmp/src/agent/snmpa_conf.erl index 4e5aab5319..4b88eb69f7 100644 --- a/lib/snmp/src/agent/snmpa_conf.erl +++ b/lib/snmp/src/agent/snmpa_conf.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2006-2010. All Rights Reserved. +%% Copyright Ericsson AB 2006-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 |