diff src/share/vm/memory/genCollectedHeap.cpp @ 2297:fe8ab1affd14

merge with jdk7-b138
author mcimadamore
date Thu, 14 Apr 2011 23:31:30 -0700
parents 3582bf76420e
children
line wrap: on
line diff
--- a/src/share/vm/memory/genCollectedHeap.cpp	Tue Mar 01 15:05:39 2011 +0000
+++ b/src/share/vm/memory/genCollectedHeap.cpp	Thu Apr 14 23:31:30 2011 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it