changeset 93:4425f7c4fb5b

Merge
author andrew
date Fri, 07 Aug 2009 02:43:38 +0100
parents 73440eb34fb0 (current diff) 845fa487f0f7 (diff)
children bcf234d82efa
files
diffstat 2 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Thu Aug 06 13:19:56 2009 +0100
+++ b/.hgtags	Fri Aug 07 02:43:38 2009 +0100
@@ -41,3 +41,4 @@
 aaa25dfd3de68c6f1a1d3ef8c45fd99f76bca6dd jdk7-b64
 aa22a1be5866a6608ba17a7a443945559409ae0f jdk7-b65
 fa8712c099edd5c9a6b3ed9729353738004d388f jdk7-b66
+faa13cd4d6cdcfb155da5ed23b0da6e0ed0f9ea8 jdk7-b67
--- a/make/build.properties	Thu Aug 06 13:19:56 2009 +0100
+++ b/make/build.properties	Fri Aug 07 02:43:38 2009 +0100
@@ -30,8 +30,8 @@
 # one of the standard user build.properties files (see build.xml)
 
 # options for the <javac> tasks used to compile the tools
-javac.source = 5
-javac.target = 5
+javac.source = 7
+javac.target = 7
 javac.debug = true
 javac.no.jdk.warnings = -XDignore.symbol.file=true
 # set the following to -version to verify the versions of javac being used