Merge

Mon, 27 Jul 2009 23:03:25 -0700

author
tbell
date
Mon, 27 Jul 2009 23:03:25 -0700
changeset 114
fbc75d7ed6dc
parent 110
5dc862ec024e
parent 113
59c202ab8a94
child 115
e1b972ff53cd

Merge

     1.1 --- a/make/README.pre-components	Fri Jul 24 13:39:46 2009 -0700
     1.2 +++ b/make/README.pre-components	Mon Jul 27 23:03:25 2009 -0700
     1.3 @@ -18,7 +18,7 @@
     1.4    ALT_LANGTOOLS_DIST    The dist area from a langtools build to use, if provided
     1.5    ALT_OUTPUTDIR         Parent dir of build and dist directories, if provided
     1.6    VARIANT               If DBG, debug build, if OPT, optimized build
     1.7 -  TARGET_CLASS_VERSION  The classfile version number (currently 5)
     1.8 +  TARGET_CLASS_VERSION  The classfile version number (currently 7)
     1.9    ANT_HOME              Home of ant to use, if provided
    1.10    QUIET                 If defined, be quiet
    1.11    VERBOSE               If defined, be verbose

mercurial