From 153e6ad4bd7d87a16c115c38681d2a55f87fda42 Mon Sep 17 00:00:00 2001
From: adam <adam@megacz.com>
Date: Sun, 25 Feb 2007 20:46:36 -0500
Subject: [PATCH] harmonize conflict in sbp.html

darcs-hash:20070226014636-5007d-9e25a346af362aa3f87e6fcd06e4df529c70ce28.gz
---
 doc/sbp.html |   19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/doc/sbp.html b/doc/sbp.html
index e6e85a5..fa933e6 100644
--- a/doc/sbp.html
+++ b/doc/sbp.html
@@ -84,15 +84,26 @@ The <a href=api/edu/berkeley/sbp/package-summary.html>API has been finalized</a>
 <br><br>
 <center>
 <table width=400><tr><td>
-<font color=red><b>Update:</b></font> [05-July-2006]<br><br>
 
+<font color=gray><b>Update:</b></font> [17-July-2006]<br><br>
+
+There is now a <a href=http://research.cs.berkeley.edu/project/sbp/list/>mailing list</a>.
+
+
+</td></tr></table>
+</center>
+
+<br><br>
+<center>
+<table width=400><tr><td>
+<font color=gray><b>Update:</b> [05-July-2006]</font><br><br>
+<font color=gray>
 The reflective grammar-to-java bindings are complete, so SBP is now
 vastly easier to use.  You can find example code <a
 href=../src/edu/berkeley/sbp/misc/Demo.java>here</a>
 and the companion grammar <a
 href=../tests/demo.g>here</a>.
-I will be writing up a tutorial tomorrow (the 7th). -- Adam
-
+</font>
 </td></tr></table>
 </center>
 
@@ -292,4 +303,4 @@ regression tests.
 
 </td></tr></table></center>
 </body>
-</html>
\ No newline at end of file
+</html>
-- 
1.7.10.4