Mercurial > hg > release > icedtea7-forest-2.0 > jaxws
changeset 248:97c69227f325
Merge
author | lana |
---|---|
date | Sun, 17 Apr 2011 16:30:49 -0700 |
parents | d5e3452a6909 (current diff) c025078c8362 (diff) |
children | 82a9022c4f21 581dab3f0773 |
files | |
diffstat | 5 files changed, 6 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Tue Apr 12 12:39:55 2011 -0700 +++ b/.hgtags Sun Apr 17 16:30:49 2011 -0700 @@ -111,3 +111,5 @@ 545de8303fec939db3892f7c324dd7df197e8f09 jdk7-b134 d5fc61f18043765705ef22b57a68c924ab2f1a5b jdk7-b135 c81d289c9a532d6e94af3c09d856a2a20529040f jdk7-b136 +ccea3282991ce8b678e188cf32a8239f76ff3bfa jdk7-b137 +cc956c8a8255583535597e9a63db23c510e9a063 jdk7-b138
--- a/build-defs.xml Tue Apr 12 12:39:55 2011 -0700 +++ b/build-defs.xml Sun Apr 17 16:30:49 2011 -0700 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!-- - Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2009, 2010, 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
--- a/build-drop-template.xml Tue Apr 12 12:39:55 2011 -0700 +++ b/build-drop-template.xml Sun Apr 17 16:30:49 2011 -0700 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!-- - Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2009, 2010, 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
--- a/build.xml Tue Apr 12 12:39:55 2011 -0700 +++ b/build.xml Sun Apr 17 16:30:49 2011 -0700 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!-- - Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2009, 2010, 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
--- a/make/Makefile Tue Apr 12 12:39:55 2011 -0700 +++ b/make/Makefile Sun Apr 17 16:30:49 2011 -0700 @@ -1,5 +1,5 @@ # -# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2007, 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