hg: jdk9/jdk9/nashorn: 2 new changesets

[lana.steuck at oracle.com]

Changeset: 7cbb2b5867fd
Author:    sundar
Date:      2015-08-13 19:07 +0530
URL:       http://hg.openjdk.java.net/jdk9/jdk9/nashorn/rev/7cbb2b5867fd

8133347: Add makefiles support and basic session, persistence history navigation with jline
Reviewed-by: erikj, jlahoda, jlaskey

! make/BuildNashorn.gmk
! make/build.xml
! make/project.properties
+ src/jdk.scripting.nashorn.shell/share/classes/jdk/nashorn/tools/jjs/Console.java
+ src/jdk.scripting.nashorn.shell/share/classes/jdk/nashorn/tools/jjs/Main.java
! src/jdk.scripting.nashorn/share/classes/jdk/nashorn/tools/Shell.java

Changeset: 6f634e84387e
Author:    lana
Date:      2015-08-13 14:15 -0700
URL:       http://hg.openjdk.java.net/jdk9/jdk9/nashorn/rev/6f634e84387e

Merge