hg: verona/stage/nashorn: 2 new changesets

[magnus.ihse.bursie at oracle.com]

Changeset: aad920be350a
Author:    ihse
Date:      2015-06-11 00:23 +0200
URL:       http://hg.openjdk.java.net/verona/stage/nashorn/rev/aad920be350a

8085822: JEP 223: New Version-String Scheme (initial integration)
Reviewed-by: erikj, dcubed, dholmes, alanb, sundar
Contributed-by: Magnus Ihse Bursie <magnus.ihse.bursie at oracle.com>

! make/BuildNashorn.gmk
! make/build.xml
! src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/Version.java
- src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/version.properties-template
+ src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/version.properties.template

Changeset: 3fc9a15406c9
Author:    ihse
Date:      2015-06-11 00:50 +0200
URL:       http://hg.openjdk.java.net/verona/stage/nashorn/rev/3fc9a15406c9

Merge

! make/build.xml