Merge
authorduke
Wed, 05 Jul 2017 16:38:16 +0200
changeset 722 2284599c0977
parent 721 a56dfa43e9c6 (diff)
parent 719 22378c5d717a (current diff)
child 725 3d6b58de3f1c
Merge
jdk/src/share/classes/com/sun/jmx/mbeanserver/OpenConverter.java
jdk/src/share/classes/javax/management/ToQueryString.java
--- a/jaxp/.hgtags	Wed Jul 05 16:38:12 2017 +0200
+++ b/jaxp/.hgtags	Wed Jul 05 16:38:16 2017 +0200
@@ -3,3 +3,4 @@
 da43cb85fac1646d6f97e4a35e510bbfdff97bdb jdk7-b26
 bafed478d67c3acf7744aaad88b9404261ea6739 jdk7-b27
 b996318955c0ad8e9fa0ffb56c74f626786e863f jdk7-b28
+617ee8607cfd5fd81f233f3c0b690f85084687a0 jdk7-b29
--- a/jaxp/make/Makefile	Wed Jul 05 16:38:12 2017 +0200
+++ b/jaxp/make/Makefile	Wed Jul 05 16:38:16 2017 +0200
@@ -1,5 +1,5 @@
 #
-# Copyright 2007 Sun Microsystems, Inc.  All Rights Reserved.
+# Copyright 2007-2008 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