diff options
author | tbell <none@none> | 2009-07-30 23:36:44 -0700 |
---|---|---|
committer | tbell <none@none> | 2009-07-30 23:36:44 -0700 |
commit | ff32102fee349d1a74dd3ecac2c3783b068086a8 (patch) | |
tree | ef54e4189129bcdeca89844faecebf067d360bb6 | |
parent | 1e18a3f26cdafc54369c89bbc886d0000ea5d1e1 (diff) | |
parent | d9da78c81d29d6c6943204334a5757960e433218 (diff) |
Mergejdk7-b68
-rw-r--r-- | .hgtags | 1 | ||||
-rw-r--r-- | make/deploy-rules.gmk | 2 | ||||
-rw-r--r-- | make/jprt.properties | 2 | ||||
-rw-r--r-- | make/sanity-rules.gmk | 2 |
4 files changed, 4 insertions, 3 deletions
@@ -41,3 +41,4 @@ c7ed15ab92ce36a09d264a5e34025884b2d7607f jdk7-b62 269c1ec4435dfb7b452ae6e3bdde005d55c5c830 jdk7-b64 e01380cd1de4ce048b87d059d238e5ab5e341947 jdk7-b65 6bad5e3fe50337d95b1416d744780d65bc570da6 jdk7-b66 +c4523c6f82048f420bf0d57c4cd47976753b7d2c jdk7-b67 diff --git a/make/deploy-rules.gmk b/make/deploy-rules.gmk index 2884601..afec0ea 100644 --- a/make/deploy-rules.gmk +++ b/make/deploy-rules.gmk @@ -1,5 +1,5 @@ # -# 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 diff --git a/make/jprt.properties b/make/jprt.properties index 7f2fffd..b451b0f 100644 --- a/make/jprt.properties +++ b/make/jprt.properties @@ -1,5 +1,5 @@ # -# 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 diff --git a/make/sanity-rules.gmk b/make/sanity-rules.gmk index 2119af3..5d2a7ad 100644 --- a/make/sanity-rules.gmk +++ b/make/sanity-rules.gmk @@ -1,5 +1,5 @@ # -# 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 |