# HG changeset patch
# User mchung
# Date 1367972040 25200
# Node ID d4e6dfa6df3b173dc2bc17dcbd42acabd3e3b1a6
# Parent  24fa5452e5d4e9df8b85196283275a6ca4b4adb4# Parent  3787b6e5d1e635e3a319326d83c08ff162b47db5
Merge

diff -r 24fa5452e5d4 -r d4e6dfa6df3b .hgtags
--- a/.hgtags	Thu Apr 25 09:24:14 2013 -0700
+++ b/.hgtags	Tue May 07 17:14:00 2013 -0700
@@ -51,6 +51,7 @@
 f4466e1b608088c90e11beaa4b600f102608c6a1 jdk7-b74
 fcf2b8b5d606641659419f247fcee4b284c45e6e jdk7-b75
 765d2077d1e652e234d27fe85ba58a986b488503 jdk7-b76
+b6d83dac31a8101a32eceaa04a922f85ccf1acf4 jigsaw-b01
 5b4968c110476085225d3a71c4210fad2c1116c1 jdk7-b77
 fc1c72d1dfbb17db7d46bba8db9afc39cbbb9299 jdk7-b78
 c08894f5b6e594b9b12993e256b96c1b38099632 jdk7-b79
@@ -59,7 +60,10 @@
 31573ae8eed15a6c170f3f0d1abd0b9109c0e086 jdk7-b82
 371e3ded591d09112a9f231e37cb072781c486ac jdk7-b83
 8bc02839eee4ef02cd1b50e87638874368a26535 jdk7-b84
+278bff8b9960ceefdc9fbcd8b5570e84a1836fef jigsaw-b02
 8424512588ff95362c1f1e5f11c6efd4e7f7db6e jdk7-b85
+5b453e0d76e43a88b2c696b34c967029c22b32b7 jigsaw-b03
+fe9f79764b888abdf03b96bedb41dbbe4d3fe2d7 jigsaw-b04
 512b0e924a5ae0c0b7ad326182cae0dc0e4d1aa8 jdk7-b86
 3febd6fab2ac8ffddbaf7bed00d11290262af153 jdk7-b87
 8c666f8f3565974e301ccb58b7538912551a6e26 jdk7-b88
@@ -67,6 +71,8 @@
 ead7c4566a0017bcb44b468b3ac03b60dc5333ce jdk7-b90
 cf4686bf35abd1e573f09fa43cbec66403160ae9 jdk7-b91
 df7c033f6a11c0973ab0e74701b1248aee9b659f jdk7-b92
+50dbc5808ec3f51c0f1c48f43dbc671c89aea31d jigsaw-b05
+2addcb5741c7a904d232f3dc7f74e994b67f369e jigsaw-b06
 797bef19197566ffb056edaa1b34db43bd9bf7b0 jdk7-b93
 8515e093efd14ac054e941ef743f76561a393a70 jdk7-b94
 ee06cfb113d554b5c8a9a53383bae2b168533829 jdk7-b95
diff -r 24fa5452e5d4 -r d4e6dfa6df3b .jcheck/conf
--- a/.jcheck/conf	Thu Apr 25 09:24:14 2013 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-project=jdk8