# HG changeset patch
# User asaha
# Date 1337637063 25200
# Node ID 6aadb7d985649b6367e4d3e7504e2fcbe88065cd
# Parent  0e635b48336a54c08a8e38156504a97b01d5c2d3# Parent  9ecfdbd6aed4702674eaede2023b4a19513d6b36
Merge

diff -r 0e635b48336a -r 6aadb7d98564 .hgtags
--- a/.hgtags	Tue May 08 07:30:48 2012 -0700
+++ b/.hgtags	Mon May 21 14:51:03 2012 -0700
@@ -158,3 +158,6 @@
 8b91a897a04486cf901af0de7f684a3eb31f121f jdk8-b34
 e187f3ede64965dc2979df9a211107cd3d38eacb jdk8-b35
 cfd288fe1d3e2b700838342e70d71d44ac991af5 jdk8-b36
+90204bfab4e2bed402badcc997cbf8446ab5669f jdk8-b37
+5bbe0cb6f2f2d7ce292da77bf4fa9d618d770a78 jdk8-b38
+f95fdbe525c88ef0d57dc1390be6582a8af5e07c jdk8-b39
diff -r 0e635b48336a -r 6aadb7d98564 makefiles/Makefile
--- a/makefiles/Makefile	Tue May 08 07:30:48 2012 -0700
+++ b/makefiles/Makefile	Mon May 21 14:51:03 2012 -0700
@@ -47,7 +47,7 @@
 
 $(eval $(call SetupJavaCompilation,BUILD_JAXP,\
 		SETUP:=GENERATE_NEWBYTECODE_DEBUG,\
-		SRC:=$(JAXP_TOPDIR)/src/share/classes,\
+		SRC:=$(JAXP_TOPDIR)/src,\
 		CLEAN:=.properties,\
 		BIN:=$(JAXP_OUTPUTDIR)/classes,\
 		SRCZIP:=$(JAXP_OUTPUTDIR)/dist/lib/src.zip))