changeset 12358:adb65d4c97f3

Merge
author duke
date Wed, 05 Jul 2017 18:08:16 +0200
parents dc30e060f828 64c2019dcc99
children abd2fb27bc48
files
diffstat 6 files changed, 7 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags-top-repo	Thu Apr 12 09:35:19 2012 -0700
+++ b/.hgtags-top-repo	Wed Jul 05 18:08:16 2017 +0200
@@ -155,3 +155,4 @@
 0b66f43b89a6c0ac1c15d7ec51992c541cdc9089 jdk8-b31
 88176171e940f02916a312c265a34c32552a8376 jdk8-b32
 42f275168fa5d9e7c70b246614dca8cf81f52c2e jdk8-b33
+894a478d2c4819a1a0f230bd7bdd09f3b2de9a8c jdk8-b34
--- a/corba/.hgtags	Thu Apr 12 09:35:19 2012 -0700
+++ b/corba/.hgtags	Wed Jul 05 18:08:16 2017 +0200
@@ -155,3 +155,4 @@
 1954151dfae8f73db24e396380f7c02bdd47c486 jdk8-b31
 5d820cb6b1afd75b619e7fd69e4f2b0eb1d5d6a1 jdk8-b32
 1e2ac1ea3f6c32a62bf88f3fa330120c30db59cb jdk8-b33
+e24c5cc8b0f7cc48374eef0f995838fb4823e0eb jdk8-b34
--- a/hotspot/.hgtags	Thu Apr 12 09:35:19 2012 -0700
+++ b/hotspot/.hgtags	Wed Jul 05 18:08:16 2017 +0200
@@ -238,3 +238,4 @@
 cd47da9383cd932cb2b659064057feafa2a91134 hs24-b06
 785bcf415ead2eaa5f6677aaf528481008140bac jdk8-b33
 7c6aba65acd2c334f1c3512b574f9038cddac24b hs24-b07
+f284b08835584517c1ca3dd67341f569e763841f jdk8-b34
--- a/jaxp/.hgtags	Thu Apr 12 09:35:19 2012 -0700
+++ b/jaxp/.hgtags	Wed Jul 05 18:08:16 2017 +0200
@@ -155,3 +155,4 @@
 94aabe098916440ae7911866311c9617d8481a36 jdk8-b31
 60960fbc75df8be4c1a2504aa69fc1428cc94f93 jdk8-b32
 9bcab2b8b8ea578e594916a3d3df6dbec7984bcb jdk8-b33
+8b91a897a04486cf901af0de7f684a3eb31f121f jdk8-b34
--- a/jdk/.hgtags	Thu Apr 12 09:35:19 2012 -0700
+++ b/jdk/.hgtags	Wed Jul 05 18:08:16 2017 +0200
@@ -155,3 +155,4 @@
 27f0c08c427c65fcab6917edf646f59058e59524 jdk8-b31
 ddfe5562f61f54ed2121ac0c73b688b94f3e66b5 jdk8-b32
 78cea258caaba3980ba186c426da82c8fe41bfd7 jdk8-b33
+29b680393f33bf953688c17d93aca7a870ca4024 jdk8-b34
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/makefiles/common/shared/Defs-utils.gmk	Wed Jul 05 18:08:16 2017 +0200
@@ -0,0 +1,2 @@
+# Purposely empty for now, should be removed eventually.
+