diff options
| author | Micael Karlberg <[email protected]> | 2011-04-06 15:11:00 +0200 |
|---|---|---|
| committer | Micael Karlberg <[email protected]> | 2011-04-06 15:11:00 +0200 |
| commit | 4346b5dae76052e8c06b1cda70d561b10c1c486d (patch) | |
| tree | 8de6b459b429aa24e1bd9738a4fb3b6e07a083a8 /erts/emulator/hipe/hipe_perfctr.c | |
| parent | 3bc0fccb951ffb0909d2824b65d58ad31ad16cc5 (diff) | |
| parent | d8dcd70f386de09109ca1f6f817a381cd1387769 (diff) | |
| download | otp-4346b5dae76052e8c06b1cda70d561b10c1c486d.tar.gz otp-4346b5dae76052e8c06b1cda70d561b10c1c486d.tar.bz2 otp-4346b5dae76052e8c06b1cda70d561b10c1c486d.zip | |
Merge branch 'dev' into bmk/inets/inet56_integration
Diffstat (limited to 'erts/emulator/hipe/hipe_perfctr.c')
| -rw-r--r-- | erts/emulator/hipe/hipe_perfctr.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/erts/emulator/hipe/hipe_perfctr.c b/erts/emulator/hipe/hipe_perfctr.c index 69bb648854..371b3fb097 100644 --- a/erts/emulator/hipe/hipe_perfctr.c +++ b/erts/emulator/hipe/hipe_perfctr.c @@ -1,23 +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$ - */ + + #ifdef HAVE_CONFIG_H #include "config.h" #endif |