Merge

2017-07-05 18:08:16 +02:00 · 2017-07-05 18:08:16 +02:00 · 182acce83c
commit 182acce83c
parent a19cce278c e9d867ac0a
6 changed files with 7 additions and 0 deletions
--- a/.hgtags-top-repo
+++ b/.hgtags-top-repo
@ -155,3 +155,4 @@ cc771d92284f71765eca14d6d08703c4af254c04 jdk8-b21
 0b66f43b89a6c0ac1c15d7ec51992c541cdc9089 jdk8-b31
 88176171e940f02916a312c265a34c32552a8376 jdk8-b32
 42f275168fa5d9e7c70b246614dca8cf81f52c2e jdk8-b33
+894a478d2c4819a1a0f230bd7bdd09f3b2de9a8c jdk8-b34
--- a/corba/.hgtags
+++ b/corba/.hgtags
@ -155,3 +155,4 @@ e45d6b406d5f91ff5256a5c82456ab1e7eb8becd jdk8-b25
 1954151dfae8f73db24e396380f7c02bdd47c486 jdk8-b31
 5d820cb6b1afd75b619e7fd69e4f2b0eb1d5d6a1 jdk8-b32
 1e2ac1ea3f6c32a62bf88f3fa330120c30db59cb jdk8-b33
+e24c5cc8b0f7cc48374eef0f995838fb4823e0eb jdk8-b34
--- a/hotspot/.hgtags
+++ b/hotspot/.hgtags
@ -238,3 +238,4 @@ f4767e53d6e0d5da7e3f1775904076cce54247c1 hs24-b04
 cd47da9383cd932cb2b659064057feafa2a91134 hs24-b06
 785bcf415ead2eaa5f6677aaf528481008140bac jdk8-b33
 7c6aba65acd2c334f1c3512b574f9038cddac24b hs24-b07
+f284b08835584517c1ca3dd67341f569e763841f jdk8-b34
--- a/jaxp/.hgtags
+++ b/jaxp/.hgtags
@ -155,3 +155,4 @@ f3244c1f04864d35c41fa8d13669faf4f65b81e2 jdk8-b28
 94aabe098916440ae7911866311c9617d8481a36 jdk8-b31
 60960fbc75df8be4c1a2504aa69fc1428cc94f93 jdk8-b32
 9bcab2b8b8ea578e594916a3d3df6dbec7984bcb jdk8-b33
+8b91a897a04486cf901af0de7f684a3eb31f121f jdk8-b34
--- a/jdk/.hgtags
+++ b/jdk/.hgtags
@ -155,3 +155,4 @@ cdbb33303ea344d5e9013e2dd642e7a6e7768db6 jdk8-b30
 27f0c08c427c65fcab6917edf646f59058e59524 jdk8-b31
 ddfe5562f61f54ed2121ac0c73b688b94f3e66b5 jdk8-b32
 78cea258caaba3980ba186c426da82c8fe41bfd7 jdk8-b33
+29b680393f33bf953688c17d93aca7a870ca4024 jdk8-b34
--- a/jdk/makefiles/common/shared/Defs-utils.gmk
+++ b/jdk/makefiles/common/shared/Defs-utils.gmk
@ -0,0 +1,2 @@
+# Purposely empty for now, should be removed eventually.
+
				`@ -0,0 +1,2 @@`
				`# Purposely empty for now, should be removed eventually.`