aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/hipe/hipe_amd64_glue.h
diff options
context:
space:
mode:
authorMicael Karlberg <[email protected]>2011-04-12 13:31:22 +0200
committerMicael Karlberg <[email protected]>2011-04-12 13:31:22 +0200
commit7263707193d974050f485bd034e91ce4c3c7cb8f (patch)
tree42ae12b4c3234d1428fc09a4195546bf6237fa3c /erts/emulator/hipe/hipe_amd64_glue.h
parent057911fd21db849ff4f6a9fa28674002945f725f (diff)
parent47fc3df88eada4b07d8805dbc7fd418f6fac1c11 (diff)
downloadotp-7263707193d974050f485bd034e91ce4c3c7cb8f.tar.gz
otp-7263707193d974050f485bd034e91ce4c3c7cb8f.tar.bz2
otp-7263707193d974050f485bd034e91ce4c3c7cb8f.zip
Merge branch 'dev' into bmk/snmp/manager/request_override_options
Diffstat (limited to 'erts/emulator/hipe/hipe_amd64_glue.h')
-rw-r--r--erts/emulator/hipe/hipe_amd64_glue.h15
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