diff options
| author | Micael Karlberg <[email protected]> | 2011-04-18 16:36:53 +0200 |
|---|---|---|
| committer | Micael Karlberg <[email protected]> | 2011-04-18 16:36:53 +0200 |
| commit | 42ef7086abd717e7a428804fe387b782abab9827 (patch) | |
| tree | b4e8bab2dc224ee0d71bd522fbd0bc36a2b69550 /erts/emulator/hipe/hipe_amd64_glue.h | |
| parent | 30a9f962d349f322f389ebc056e972f871e689a8 (diff) | |
| parent | 9022ef27b8628ca680654d542b4d520426480c2d (diff) | |
| download | otp-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_amd64_glue.h')
| -rw-r--r-- | erts/emulator/hipe/hipe_amd64_glue.h | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/erts/emulator/hipe/hipe_amd64_glue.h b/erts/emulator/hipe/hipe_amd64_glue.h index c92eb842cb..36508467fa 100644 --- a/erts/emulator/hipe/hipe_amd64_glue.h +++ b/erts/emulator/hipe/hipe_amd64_glue.h @@ -1,24 +1,23 @@ /* * %CopyrightBegin% - * - * Copyright Ericsson AB 2004-2009. All Rights Reserved. - * + * + * Copyright Ericsson AB 2004-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$ - */ + + #ifndef HIPE_AMD64_GLUE_H #define HIPE_AMD64_GLUE_H |