diff src/share/vm/includeDB_core @ 1096:84a2da7f454c

Merge
author jmasa
date Fri, 11 Dec 2009 08:39:30 -0800
parents 7c57aead6d3e 6aa7255741f3
children aa62b9388fce
line wrap: on
line diff
--- a/src/share/vm/includeDB_core	Wed Dec 02 13:29:00 2009 -0800
+++ b/src/share/vm/includeDB_core	Fri Dec 11 08:39:30 2009 -0800
@@ -289,7 +289,7 @@
 attachListener.hpp                      debug.hpp
 attachListener.hpp                      ostream.hpp
 
-barrierSet.cpp				barrierSet.hpp
+barrierSet.cpp				barrierSet.inline.hpp
 barrierSet.cpp			        collectedHeap.hpp
 barrierSet.cpp				universe.hpp