changeset 334:2102e572f316

Merge
author alanb
date Mon, 28 May 2012 16:38:13 +0100
parents 1d34415328c6 (current diff) 6f5c0e17415d (diff)
children 46a4ac83f199
files .hgtags
diffstat 2 files changed, 5 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Thu May 03 15:49:38 2012 -0700
+++ b/.hgtags	Mon May 28 16:38:13 2012 +0100
@@ -164,3 +164,7 @@
 8b91a897a04486cf901af0de7f684a3eb31f121f jdk8-b34
 e187f3ede64965dc2979df9a211107cd3d38eacb jdk8-b35
 cfd288fe1d3e2b700838342e70d71d44ac991af5 jdk8-b36
+90204bfab4e2bed402badcc997cbf8446ab5669f jdk8-b37
+5bbe0cb6f2f2d7ce292da77bf4fa9d618d770a78 jdk8-b38
+f95fdbe525c88ef0d57dc1390be6582a8af5e07c jdk8-b39
+9ecfdbd6aed4702674eaede2023b4a19513d6b36 jdk8-b40
--- a/makefiles/Makefile	Thu May 03 15:49:38 2012 -0700
+++ b/makefiles/Makefile	Mon May 28 16:38:13 2012 +0100
@@ -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))