# HG changeset patch # User jlaskey # Date 1366023994 10800 # Node ID 79d976ac51c236466ec91dfc7b2c49207852f875 # Parent 1abb27fd4a5e7a774a5d66cf6e319fbb7e81166a# Parent 81fda7dbde35fbc5440eb67cb924b9c78d0aa37b Merge diff -r 1abb27fd4a5e -r 79d976ac51c2 common/autoconf/generated-configure.sh diff -r 1abb27fd4a5e -r 79d976ac51c2 common/autoconf/spec.gmk.in diff -r 1abb27fd4a5e -r 79d976ac51c2 common/bin/hgforest.sh diff -r 1abb27fd4a5e -r 79d976ac51c2 common/makefiles/Main.gmk diff -r 1abb27fd4a5e -r 79d976ac51c2 make/nashorn-rules.gmk