[robotframework] push by pekka.klarck - version back to trunk on 2011-06-29 12:49 GMT

[robotframework]

Revision: 9935369e6857
Author:   Pekka Klärck
Date:     Wed Jun 29 05:49:11 2011
Log:      version back to trunk
http://code.google.com/p/robotframework/source/detail?r=9935369e6857

Modified:
 /src/robot/version.py

=======================================
--- /src/robot/version.py       Wed Jun 29 05:45:26 2011
+++ /src/robot/version.py       Wed Jun 29 05:49:11 2011
@@ -2,9 +2,9 @@

 import sys

-VERSION = '2.6'
-RELEASE = 'beta2'
-TIMESTAMP = '20110629-154450'
+VERSION = 'trunk'
+RELEASE = '20110629'
+TIMESTAMP = '20110629-154856'

 def get_version(sep=' '):
     if RELEASE == 'final':