Merge

fbf3d86c · tbell · 2e05a9b5 · 9cd519b7 · fbf3d86c · fbf3d86c
显示空白变更内容
内联并排

Showing with 4 addition and 3 deletion

.hgtags .hgtags +1 -0

make/deploy-rules.gmk make/deploy-rules.gmk +1 -1

make/jprt.properties make/jprt.properties +1 -1

make/sanity-rules.gmk make/sanity-rules.gmk +1 -1

未找到文件。
--- a/.hgtags
+++ b/.hgtags
@@ -41,3 +41,4 @@ c7ed15ab92ce36a09d264a5e34025884b2d7607f jdk7-b62
 269c1ec4435dfb7b452ae6e3bdde005d55c5c830 jdk7-b64
 e01380cd1de4ce048b87d059d238e5ab5e341947 jdk7-b65
 6bad5e3fe50337d95b1416d744780d65bc570da6 jdk7-b66
+c4523c6f82048f420bf0d57c4cd47976753b7d2c jdk7-b67
--- a/make/deploy-rules.gmk
+++ b/make/deploy-rules.gmk
 #
-# Copyright 2002-2007 Sun Microsystems, Inc.  All Rights Reserved.
+# Copyright 2002-2009 Sun Microsystems, Inc.  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

--- a/make/jprt.properties
+++ b/make/jprt.properties
 #
-# Copyright 2006-2007 Sun Microsystems, Inc.  All Rights Reserved.
+# Copyright 2006-2009 Sun Microsystems, Inc.  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

--- a/make/sanity-rules.gmk
+++ b/make/sanity-rules.gmk
 #
-# Copyright 2001-2007 Sun Microsystems, Inc.  All Rights Reserved.
+# Copyright 2001-2009 Sun Microsystems, Inc.  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