Author: dom Date: 2010-02-28 16:38:02 +0000 (Sun, 28 Feb 2010) New Revision: 1286

Modified: website/publish/ website/publish/gone.shtml website/publish/includes/cities_list.inc Log: merge to publish

Property changes on: website/publish ___________________________________________________________________ Modified: svn:mergeinfo - /website/preview:1265-1277 + /website/preview:1265-1277,1284-1285

Property changes on: website/publish/gone.shtml ___________________________________________________________________ Modified: svn:mergeinfo - /website/preview/gone.shtml:1276-1277 + /website/preview/gone.shtml:1276-1277,1284-1285

Modified: website/publish/includes/cities_list.inc =================================================================== --- website/publish/includes/cities_list.inc 2010-02-28 16:37:27 UTC (rev 1285) +++ website/publish/includes/cities_list.inc 2010-02-28 16:38:02 UTC (rev 1286) @@ -11,54 +11,39 @@

<tr> <td><a href="http://cambridge.openguides.org/">Cambridge</a></td> - <td><a href="http://norwich.openguides.org/">Norwich</a></td> + <td><a href="http://oxford.openguides.org/">Oxford</a></td> </tr> <tr> <td><a href="http://cotswolds.openguides.org/">Cotswolds</a></td> - <td><a href="http://nottingham.openguides.org/">Nottingham</a></td> - <tr> - <td><a href="http://london.openguides.org/">London</a></td> - <td><a href="http://oxford.openguides.org/">Oxford</a></td> + <td><a href="http://the.earth.li/~kake/cgi-bin/openguides/vegan-oxford.cgi">Vegan Oxford</a></td> </tr> <tr> <td><a href="http://london.randomness.org.uk/">Randomness (London)</a></td> - <td><a href="http://the.earth.li/~kake/cgi-bin/openguides/vegan-oxford.cgi">Vegan Oxford</a></td> + <td><a href="http://reading.openguides.org/">Reading</a></td> </tr> <tr> <td><a href="http://miltonkeynes.openguides.org/">Milton Keynes</a></td> - <td><a href="http://reading.openguides.org/">Reading</a></td> + <td><a href="http://southampton.openguides.org/">Southampton</a></td> </tr> <tr> <td><a href="http://north-devon.openguides.org/">North Devon</a></td> - <td><a href="http://southampton.openguides.org/">Southampton</a></td> + <td></td> </tr> - <tr> - <th>Canada</th>

+ <tr> <th>Europe</th> + <th></th> </tr> <tr> - <td><a href="http://victoria.openguides.org/">Victoria, BC</a></td> <td><a href="http://www.justbiit.com/cgi-bin/openguides/">Brussels</a></td> + <td></td> </tr> <tr> - <td>&nbsp;</td> <td><a href="http://cern.openguides.org/">CERN</a></td> + <td></td> </tr> - <tr> - <th>USA</th> - <th>Worldwide</th> - </tr>

- <tr> - <td><a href="http://boston.openguides.org/">Boston, MA</a></td> - <td><a href="http://engineer.openguides.org/">Tourist Engineer</a></td> - </tr> - <tr> - <td><a href="http://saintpaul.openguides.org/">Saint Paul, MN</a></td> - </tr> - </table> </div>

-<!-- end cities list --> \ No newline at end of file +<!-- end cities list -->