aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/hipe/hipe_arm.c
diff options
context:
space:
mode:
authorMicael Karlberg <[email protected]>2011-04-18 16:36:53 +0200
committerMicael Karlberg <[email protected]>2011-04-18 16:36:53 +0200
commit42ef7086abd717e7a428804fe387b782abab9827 (patch)
treeb4e8bab2dc224ee0d71bd522fbd0bc36a2b69550 /erts/emulator/hipe/hipe_arm.c
parent30a9f962d349f322f389ebc056e972f871e689a8 (diff)
parent9022ef27b8628ca680654d542b4d520426480c2d (diff)
downloadotp-42ef7086abd717e7a428804fe387b782abab9827.tar.gz
otp-42ef7086abd717e7a428804fe387b782abab9827.tar.bz2
otp-42ef7086abd717e7a428804fe387b782abab9827.zip
Merge branch 'bmk/snmp/agent/multi_engine_id_for_traps/OTP-9119' into bmk/agent/extra_info_notification/OTP-9183
Conflicts: lib/snmp/doc/src/notes.xml lib/snmp/src/app/snmp.appup.src
Diffstat (limited to 'erts/emulator/hipe/hipe_arm.c')
-rw-r--r--erts/emulator/hipe/hipe_arm.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/erts/emulator/hipe/hipe_arm.c b/erts/emulator/hipe/hipe_arm.c
index b70b32947b..d52f429a9b 100644
--- a/erts/emulator/hipe/hipe_arm.c
+++ b/erts/emulator/hipe/hipe_arm.c
@@ -1,23 +1,23 @@
/*
* %CopyrightBegin%
- *
- * Copyright Ericsson AB 2005-2009. All Rights Reserved.
- *
+ *
+ * Copyright Ericsson AB 2005-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
* compliance with the License. You should have received a copy of the
* Erlang Public License along with this software. If not, it can be
* retrieved online at http://www.erlang.org/.
- *
+ *
* Software distributed under the License is distributed on an "AS IS"
* basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
* the License for the specific language governing rights and limitations
* under the License.
- *
+ *
* %CopyrightEnd%
*/
-/* $Id$
- */
+
+
#include <stddef.h> /* offsetof() */
#ifdef HAVE_CONFIG_H
#include "config.h"