aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/hipe/hipe_x86.h
diff options
context:
space:
mode:
authorMicael Karlberg <[email protected]>2011-04-08 17:51:55 +0200
committerMicael Karlberg <[email protected]>2011-04-08 17:51:55 +0200
commit24a9408229d14b3b0c41265f0c9f4c6d164e92ed (patch)
tree89bd26baac9532bcf9923da39018a36a4d4bca15 /erts/emulator/hipe/hipe_x86.h
parent332b91c46d67dc31ca6080b2ba5c03636f3d584f (diff)
parent5ad09d2928fd4584ce6dc50f44825b3f6d7ef66a (diff)
downloadotp-24a9408229d14b3b0c41265f0c9f4c6d164e92ed.tar.gz
otp-24a9408229d14b3b0c41265f0c9f4c6d164e92ed.tar.bz2
otp-24a9408229d14b3b0c41265f0c9f4c6d164e92ed.zip
Merge branch 'dev' into bmk/snmp/manager/request_override_options
Diffstat (limited to 'erts/emulator/hipe/hipe_x86.h')
-rw-r--r--erts/emulator/hipe/hipe_x86.h14
1 files changed, 7 insertions, 7 deletions
diff --git a/erts/emulator/hipe/hipe_x86.h b/erts/emulator/hipe/hipe_x86.h
index 94ca39fc4f..f0f3c158af 100644
--- a/erts/emulator/hipe/hipe_x86.h
+++ b/erts/emulator/hipe/hipe_x86.h
@@ -1,23 +1,23 @@
/*
* %CopyrightBegin%
- *
- * Copyright Ericsson AB 2003-2009. All Rights Reserved.
- *
+ *
+ * Copyright Ericsson AB 2003-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_X86_H
#define HIPE_X86_H