# HG changeset patch
# User mchung
# Date 1367972048 25200
# Node ID 202f158b31f0a0c305a16b7eb3cc8ab54987d34f
# Parent  7122f7bb0fcc8a39e5254402119b2ee3fa0ad313# Parent  e730324e3e981e2bb4ced1ec0eb59bf15934093a
Merge

diff -r 7122f7bb0fcc -r 202f158b31f0 .hgtags
--- a/.hgtags	Thu Apr 25 09:24:11 2013 -0700
+++ b/.hgtags	Tue May 07 17:14:08 2013 -0700
@@ -51,6 +51,7 @@
 ea7b88c676dd8b269bc858a4a17c14dc96c8aed1 jdk7-b74
 555fb78ee4cebed082ca7ddabff46d2e5b4c9026 jdk7-b75
 233a4871d3364ec305efd4a58cfd676620a03a90 jdk7-b76
+2e713ae65cf4927b2c87f5b921fa64209547eccf jigsaw-b01
 bfadab8c7b1bf806a49d3e1bc19ec919717f057a jdk7-b77
 7a12d3789e1b07a560fc79568b991818d617ede2 jdk7-b78
 b1005c504358c18694c84e95fec16b28cdce7ae1 jdk7-b79
@@ -59,7 +60,10 @@
 c876ad22e4bf9d3c6460080db7ace478e29a3ff9 jdk7-b82
 309a0a7fc6ceb1c9fc3a85b3608e97ef8f7b0dfd jdk7-b83
 32c0cf01d555747918529a6ff9e06b0090c7a474 jdk7-b84
+aacfa2e549498b2580c33f71fe4427aa14fc5c72 jigsaw-b02
 6c0ccabb430dacdcd4479f8b197980d5da4eeb66 jdk7-b85
+a45dbf8ee934e3733cc020392d2b8f38cf84f15d jigsaw-b03
+d5dbf8dc796829401fd67fb008e78ccb83e35c3e jigsaw-b04
 81c0f115bbe5d3bcf59864465b5eca5538567c79 jdk7-b86
 8b493f1aa136d86de0885fcba15262c4fa2b1412 jdk7-b87
 d8ebd15910034f2ba50b2f129f959f86cca01419 jdk7-b88
@@ -67,6 +71,8 @@
 c5d932ee326d6f7fd4634b11c7185ea82d184df2 jdk7-b90
 b89b2c3044a298d542f84a2e9d957202b7d8cdb9 jdk7-b91
 e6a40e4bb10499fb6ee9db71ab5654e5a17ab75b jdk7-b92
+14d143bb1fd66e43b3734d9c87b315f19383932f jigsaw-b05
+8e549baa9d5def9e656bd2419ec55bfca5260247 jigsaw-b06
 c725ca829c5aa4b50a8ed5728579ec8809fbfb1d jdk7-b93
 2de307cd3b4e71127e75dff70809c1b1fbc1a494 jdk7-b94
 07050840f98cda357aa6a8d416fdccbd03038d35 jdk7-b95
diff -r 7122f7bb0fcc -r 202f158b31f0 .jcheck/conf
--- a/.jcheck/conf	Thu Apr 25 09:24:11 2013 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-project=jdk8