# HG changeset patch # User henryjen # Date 1381529292 25200 # Node ID 93337eacc5255658929cd851abcbd18f1862e6a6 # Parent 32edc7a2c86696dfcbdb6ffae641ff153f8e34bd# Parent bc2980ea35815ed6505242566c7161d3a7ac8511 Merge diff -r 32edc7a2c866 -r 93337eacc525 .hgtags --- a/.hgtags Wed Oct 02 13:26:41 2013 -0700 +++ b/.hgtags Fri Oct 11 15:08:12 2013 -0700 @@ -167,15 +167,19 @@ f00c12994562c2f68d348a7c3e829374a89294e2 jdk8-b43 f6a417540ef124c9b4123d07da5e26f2ab909949 jdk8-b44 e80ac58b5ba904f24e125c742c30d0d740f05f86 jdk8-b45 +cdb3d2b2cb1a0e4b898c625eeb2ea0791c6eaaf4 lambda-b45 ae368a83c2404b65c9e38c65e2aa081f2201ca74 jdk8-b46 fe6a060afc404dcf0921708a740de770666b781f jdk8-b47 efb564de8a8ee397a65fab77d45cb20200f6ddd8 jdk8-b48 +bba978fbf7aaec949944aef94f6324446dfb7768 lambda-b48 b48865af8ac559ba6f60fb86fa3fe0ebdd22746c jdk8-b49 bdab72e87b83bcccf3abe6eaaa4cdc7b1cd2d92b jdk8-b50 +4ea82fd732db602f2e50b91319cf352a31a605fd lambda-b50 1a70b6333ebe12e1c6dbca30e58bc1ba894ab898 jdk8-b51 f62bc618122e87a8bea69865cc02074e9d850426 jdk8-b52 8a35fd644d3c0b75813ff0236adef8a1c6f895c6 jdk8-b53 91970935926a20f19a5cbbf20931745ac1975e91 jdk8-b54 +c886e31c3b7905e4cb0513db983824e373063be1 lambda-b56 109c9e1f2d8546e9954e1b7be9a37a4396434544 jdk8-b55 7813455ccdb08c3ee6051161176821325a5d44d7 jdk8-b56 b51b611209f159f94dd2ce3dc2c56daa6d6ac1df jdk8-b57 diff -r 32edc7a2c866 -r 93337eacc525 .jcheck/conf --- a/.jcheck/conf Wed Oct 02 13:26:41 2013 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -project=jdk8 diff -r 32edc7a2c866 -r 93337eacc525 src/share/jaxws_classes/com/sun/tools/internal/jxc/model/nav/ApNavigator.java