Author: sijskes
Date: Tue Feb 15 19:20:27 2011
New Revision: 785460
Log:
Publishing merge to river site by sijskes
Modified:
websites/production/river/ (props changed)
websites/production/river/content/ci.html
Propchange: websites/production/river/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 15 19:20:27 2011
@@ -1 +1 @@
-/websites/staging/river/trunk:778669-785420
+/websites/staging/river/trunk:778669-785459
Modified: websites/production/river/content/ci.html
==============================================================================
--- websites/production/river/content/ci.html (original)
+++ websites/production/river/content/ci.html Tue Feb 15 19:20:27 2011
@@ -91,23 +91,23 @@
</tr>
<tr>
<td>River-trunk-QA-freebsd</td>
-<td>Build and run QA tests under freebsd</td>
+<td>Build trunk and run QA tests under freebsd</td>
</tr>
<tr>
<td>River-trunk-QA-osx</td>
-<td>Build and run QA tests under OS X</td>
+<td>Build trunk and run QA tests under OS X</td>
</tr>
<tr>
<td>River-trunk-QA-solaris</td>
-<td>Build and run QA tests under Solaris</td>
+<td>Build trunk and run QA tests under Solaris</td>
</tr>
<tr>
<td>River-trunk-QA-ubuntu</td>
-<td>Build and run QA tests under Ubuntu</td>
+<td>Build trunk and run QA tests under Ubuntu</td>
</tr>
<tr>
<td>River-trunk-QA-windows</td>
-<td>Build and run QA tests under Windows</td>
+<td>Build trunk and run QA tests under Windows</td>
</tr>
<tr>
<td>River-verify</td>
