# HG changeset patch # User ohair # Date 1298092245 28800 # Node ID 70f9b5458244b656beb2f364ecb2f6ae6e5f6a95 # Parent eeb358b6ab3764f24d0c41af4a1d6ba8635d40ee# Parent 88223c071137ad67ad5dbb70012e878fe1249b29 Merge diff -r eeb358b6ab37 -r 70f9b5458244 .jcheck/conf --- a/.jcheck/conf Wed Feb 16 13:26:35 2011 -0800 +++ b/.jcheck/conf Fri Feb 18 21:10:45 2011 -0800 @@ -1,4 +1,3 @@ project=jdk6 whitespace=lax -comments=lax bugids=dup