Merge
authorkizune
Fri, 13 Dec 2013 22:13:54 +0400
changeset 22430 04238467b2df
parent 22429 7f1e7d236aa1 (current diff)
parent 22027 13b877757b0b (diff)
child 22431 a4ea62843f5a
Merge
--- a/.hgtags	Thu Dec 05 16:37:30 2013 +0400
+++ b/.hgtags	Fri Dec 13 22:13:54 2013 +0400
@@ -241,3 +241,4 @@
 31b0e03fcad73d7886b306b4c2e57ad270780d0d jdk8-b117
 f5b521ade7a35cea18df78ee86322207729f5611 jdk8-b118
 87b743b2263cc53955266411b7797b365a0fb050 jdk8-b119
+a1ee9743f4ee165eae59389a020f2552f895dac8 jdk8-b120
--- a/.hgtags-top-repo	Thu Dec 05 16:37:30 2013 +0400
+++ b/.hgtags-top-repo	Fri Dec 13 22:13:54 2013 +0400
@@ -241,3 +241,4 @@
 a4afb0a8d55ef75aef5b0d77b434070468fb89f8 jdk8-b117
 0a6db1aac998cdc88e52f9adb97d40ca5b0f1da6 jdk8-b118
 9e90215673be68a3e77a9e444e4232076373734d jdk8-b119
+cd3825b2983045784d6fc6d1729c799b08215752 jdk8-b120
--- a/corba/.hgtags	Thu Dec 05 16:37:30 2013 +0400
+++ b/corba/.hgtags	Fri Dec 13 22:13:54 2013 +0400
@@ -241,3 +241,4 @@
 e53d1ee4d2ae898f1cf58688d45a5afe7c482173 jdk8-b117
 d6820a414f182a011a53a29a52370c696cd58dab jdk8-b118
 379fc7609beb7a3d85ebc0cc21a8a51c60d3c7d3 jdk8-b119
+53fd772d28c8a9f0f43adfc06f75f6b3cfa93cb5 jdk8-b120
--- a/hotspot/.hgtags	Thu Dec 05 16:37:30 2013 +0400
+++ b/hotspot/.hgtags	Fri Dec 13 22:13:54 2013 +0400
@@ -401,3 +401,4 @@
 b2426da30009cd3069d03de073f351e6432c7682 hs25-b61
 ce42d815dd2130250acf6132b51b624001638f0d jdk8-b119
 05fedd51e40da22c9460bf17c7185889e435db3d hs25-b62
+fca262db9c4309f99d2f5542ab0780e45c2f1578 jdk8-b120
--- a/jaxp/.hgtags	Thu Dec 05 16:37:30 2013 +0400
+++ b/jaxp/.hgtags	Fri Dec 13 22:13:54 2013 +0400
@@ -241,3 +241,4 @@
 c1d234d4f16472a5163464420fa00b25ffa5298a jdk8-b117
 e4e5069250e717defcb556e2f6be291460988c51 jdk8-b118
 69a930376c70beb9877970128bad0f04cb0c6eb1 jdk8-b119
+64d8b228a72cf9082b1a9a881c81188ccffde234 jdk8-b120
--- a/jaxws/.hgtags	Thu Dec 05 16:37:30 2013 +0400
+++ b/jaxws/.hgtags	Fri Dec 13 22:13:54 2013 +0400
@@ -241,3 +241,4 @@
 fe56ba456fd32758c72db629938d69067468d89c jdk8-b117
 76a598cf50c4e1dc1fc8adc08b451943aa1a3179 jdk8-b118
 172b8e056ff259044ca48c5425d643dc8e2e05c8 jdk8-b119
+6c152deb600d8a11bc46149ace317b1c9fce1482 jdk8-b120
--- a/jdk/.hgtags	Thu Dec 05 16:37:30 2013 +0400
+++ b/jdk/.hgtags	Fri Dec 13 22:13:54 2013 +0400
@@ -241,3 +241,4 @@
 fc4ac66aa657e09de5f8257c3174f240ed0cbaf7 jdk8-b117
 28ca338366ff2774ac9002f9f6eaff4101a3ea3b jdk8-b118
 e4499a6529e8c3e762ba86f45cdd774c92a8e7bc jdk8-b119
+d31cd980e1da31fa496a359caaf1a165aeb5791a jdk8-b120
--- a/langtools/.hgtags	Thu Dec 05 16:37:30 2013 +0400
+++ b/langtools/.hgtags	Fri Dec 13 22:13:54 2013 +0400
@@ -241,3 +241,4 @@
 19de039a03a619b99f1a8b454e1618c9fa9dae66 jdk8-b117
 4fd6a7ff8c068eceaaaf8bf12a394195203b99b3 jdk8-b118
 43a80d75d06ed22d6942f25f067587a3be3a129d jdk8-b119
+b3d7e86a06474fe5100a7b15a95eaa10d41509a6 jdk8-b120
--- a/nashorn/.hgtags	Thu Dec 05 16:37:30 2013 +0400
+++ b/nashorn/.hgtags	Fri Dec 13 22:13:54 2013 +0400
@@ -229,3 +229,4 @@
 1db3d4e4d18913e853d7bebf86816e87fda00a71 jdk8-b117
 8d014b039b44c23fa520ce20c2c27f7aa91441e9 jdk8-b118
 c3343930c73c58a22c1d58719bb988aeb25a871f jdk8-b119
+55cbc2d00c93f82513ce33819d41dc67e71aaefd jdk8-b120