diff options
| author | Björn-Egil Dahlberg <[email protected]> | 2012-08-31 14:59:43 +0200 |
|---|---|---|
| committer | Björn-Egil Dahlberg <[email protected]> | 2012-08-31 14:59:43 +0200 |
| commit | 91f8f903ae866d06332a6f2ef968b419339e6003 (patch) | |
| tree | 6ab98b4cd60c4b73be8452619bae86cf90a79723 /lib/snmp/priv | |
| parent | 87c5ea0577267fd17bcc572ab81bdac030dd8332 (diff) | |
| parent | 2d03ab7ffde828d3b56f8b7738fd0c00d0f5b630 (diff) | |
| download | otp-91f8f903ae866d06332a6f2ef968b419339e6003.tar.gz otp-91f8f903ae866d06332a6f2ef968b419339e6003.tar.bz2 otp-91f8f903ae866d06332a6f2ef968b419339e6003.zip | |
Merge branch 'maint'
Conflicts:
lib/diameter/autoconf/vxworks/sed.general
xcomp/README.md
Diffstat (limited to 'lib/snmp/priv')
| -rw-r--r-- | lib/snmp/priv/conf/agent/Makefile | 2 | ||||
| -rw-r--r-- | lib/snmp/priv/conf/manager/Makefile | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/snmp/priv/conf/agent/Makefile b/lib/snmp/priv/conf/agent/Makefile index c7921bacc2..3082889dc8 100644 --- a/lib/snmp/priv/conf/agent/Makefile +++ b/lib/snmp/priv/conf/agent/Makefile @@ -2,7 +2,7 @@ # %CopyrightBegin% # -# Copyright Ericsson AB 1996-2009. 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/snmp/priv/conf/manager/Makefile b/lib/snmp/priv/conf/manager/Makefile index ba5a74c3fe..a04c227754 100644 --- a/lib/snmp/priv/conf/manager/Makefile +++ b/lib/snmp/priv/conf/manager/Makefile @@ -2,7 +2,7 @@ # %CopyrightBegin% # -# Copyright Ericsson AB 2004-2009. All Rights Reserved. +# Copyright Ericsson AB 2004-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 |