Merge

Mon, 15 Jun 2009 13:07:18 -0400

author
herrick
date
Mon, 15 Jun 2009 13:07:18 -0400
changeset 95
c7c4850f1478
parent 94
c50469cf63cd
parent 85
472c21584cfd
child 96
d28a8c422df1

Merge

     1.1 --- a/.hgtags	Thu Jun 11 15:15:49 2009 -0400
     1.2 +++ b/.hgtags	Mon Jun 15 13:07:18 2009 -0400
     1.3 @@ -34,3 +34,4 @@
     1.4  ffd09e767dfa6d21466183a400f72cf62d53297f jdk7-b57
     1.5  59b497130f82ec809c245ffb5e521e3a5fabf8af jdk7-b58
     1.6  030142474602b4a067662fffc0c8e541de5a78df jdk7-b59
     1.7 +39565502682c7085369bd09e51640919dc741097 jdk7-b60
     2.1 --- a/make/sanity-rules.gmk	Thu Jun 11 15:15:49 2009 -0400
     2.2 +++ b/make/sanity-rules.gmk	Mon Jun 15 13:07:18 2009 -0400
     2.3 @@ -348,6 +348,8 @@
     2.4  ifeq ($(SPONSORS_SRC_AVAILABLE), true)
     2.5  	@$(ECHO) "   BUILD_SPONSORS = $(BUILD_SPONSORS) " >> $(MESSAGE_FILE)
     2.6  endif
     2.7 +	@$(ECHO) "   DEBUG_CLASSFILES = $(DEBUG_CLASSFILES) " >> $(MESSAGE_FILE)
     2.8 +	@$(ECHO) "   DEBUG_BINARIES = $(DEBUG_BINARIES) " >> $(MESSAGE_FILE)
     2.9  	@$(ECHO) "" >> $(MESSAGE_FILE)
    2.10  
    2.11  .PHONY: sanity settings pre-sanity insane \

mercurial