[Checkins] SVN: Sandbox/janjaapdriessen/buildbot/buildout.cfg gocept.selenium branch merged with trunk.

[Jan-Jaap Driessen]

Log message for revision 118818:
  gocept.selenium branch merged with trunk.

Changed:
  U   Sandbox/janjaapdriessen/buildbot/buildout.cfg

-=-
Modified: Sandbox/janjaapdriessen/buildbot/buildout.cfg
===================================================================
--- Sandbox/janjaapdriessen/buildbot/buildout.cfg	2010-12-12 12:31:15 UTC (rev 118817)
+++ Sandbox/janjaapdriessen/buildbot/buildout.cfg	2010-12-12 15:24:36 UTC (rev 118818)
@@ -193,10 +193,10 @@
           zope2.12-py2.6:zope2.12_parameters
           zope2.13-py2.6:zope2.13_parameters
           zope2.14-py2.6:zope2.14_parameters
-          gocept.selenium-branch-ztk:gocept.selenium-branch-ztk-parameters
-          gocept.selenium-branch-grok:gocept.selenium-branch-grok-parameters
-          gocept.selenium-branch-wsgi:gocept.selenium-branch-wsgi-parameters
-          gocept.selenium-branch-static:gocept.selenium-branch-static-parameters
+          gocept.selenium-ztk:gocept.selenium-ztk-parameters
+          gocept.selenium-grok:gocept.selenium-grok-parameters
+          gocept.selenium-wsgi:gocept.selenium-wsgi-parameters
+          gocept.selenium-static:gocept.selenium-static-parameters
           fanstatic:fanstatic-parameters
 
 [win-py2.6]
@@ -412,26 +412,26 @@
 mailto = zope-tests at zope.org
 mailmode = all
 
-[gocept.selenium-branch-ztk-parameters]
-repos = http://svn.zope.org/repos/main/gocept.selenium/branches/janjaapdriessen-wsgi
+[gocept.selenium-ztk-parameters]
+repos = http://svn.zope.org/repos/main/gocept.selenium/trunk
 bootstrap = python2.6 bootstrap.py -c ztk.cfg
 buildout = bin/buildout -v -c ztk.cfg
 slaves = slave-ubuntu32
 
-[gocept.selenium-branch-grok-parameters]
-repos = http://svn.zope.org/repos/main/gocept.selenium/branches/janjaapdriessen-wsgi
+[gocept.selenium-grok-parameters]
+repos = http://svn.zope.org/repos/main/gocept.selenium/trunk
 bootstrap = python2.6 bootstrap.py -c grok.cfg
 buildout = bin/buildout -v -c grok.cfg
 slaves = slave-ubuntu32
 
-[gocept.selenium-branch-wsgi-parameters]
-repos = http://svn.zope.org/repos/main/gocept.selenium/branches/janjaapdriessen-wsgi
+[gocept.selenium-wsgi-parameters]
+repos = http://svn.zope.org/repos/main/gocept.selenium/trunk
 bootstrap = python2.6 bootstrap.py -c wsgi.cfg
 buildout = bin/buildout -v -c wsgi.cfg
 slaves = slave-ubuntu32
 
-[gocept.selenium-branch-static-parameters]
-repos = http://svn.zope.org/repos/main/gocept.selenium/branches/janjaapdriessen-wsgi
+[gocept.selenium-static-parameters]
+repos = http://svn.zope.org/repos/main/gocept.selenium/trunk
 bootstrap = python2.6 bootstrap.py -c static.cfg
 buildout = bin/buildout -v -c static.cfg
 slaves = slave-ubuntu32