# HG changeset patch # User amurillo # Date 1380227581 25200 # Node ID 58043478c26d4e8bf48700acea5f97aba8b417d4 # Parent fff4842215d1392d97015b5f5aceb095fba59906# Parent 3da9fad1391e331ba0a6e02194118cbcc1622169 Merge diff -r 3da9fad1391e -r 58043478c26d .hgtags --- a/.hgtags Thu Sep 26 06:34:10 2013 -0700 +++ b/.hgtags Thu Sep 26 13:33:01 2013 -0700 @@ -379,3 +379,4 @@ a09fe9d1e016c285307507a5793bc4fa6215e9c9 hs25-b50 85072013aad46050a362d10ab78e963121c8014c jdk8-b108 566db1b0e6efca31f181456e54c8911d0192410d hs25-b51 +c81dd5393a5e333df7cb1f6621f5897ada6522b5 jdk8-b109 diff -r 3da9fad1391e -r 58043478c26d make/jprt.properties --- a/make/jprt.properties Thu Sep 26 06:34:10 2013 -0700 +++ b/make/jprt.properties Thu Sep 26 13:33:01 2013 -0700 @@ -120,13 +120,13 @@ jprt.my.macosx.x64.jdk7u8=${jprt.my.macosx.x64.jdk7} jprt.my.macosx.x64=${jprt.my.macosx.x64.${jprt.tools.default.release}} -jprt.my.windows.i586.jdk8=windows_i586_5.1 -jprt.my.windows.i586.jdk7=windows_i586_5.1 +jprt.my.windows.i586.jdk8=windows_i586_6.1 +jprt.my.windows.i586.jdk7=windows_i586_6.1 jprt.my.windows.i586.jdk7u8=${jprt.my.windows.i586.jdk7} jprt.my.windows.i586=${jprt.my.windows.i586.${jprt.tools.default.release}} -jprt.my.windows.x64.jdk8=windows_x64_5.2 -jprt.my.windows.x64.jdk7=windows_x64_5.2 +jprt.my.windows.x64.jdk8=windows_x64_6.1 +jprt.my.windows.x64.jdk7=windows_x64_6.1 jprt.my.windows.x64.jdk7u8=${jprt.my.windows.x64.jdk7} jprt.my.windows.x64=${jprt.my.windows.x64.${jprt.tools.default.release}}