[or-cvs] r15917: Conflict resolved phobos. :-) (website/trunk/include)

[ioerror at seul.org]

Author: ioerror
Date: 2008-07-15 00:40:33 -0400 (Tue, 15 Jul 2008)
New Revision: 15917

Modified:
   website/trunk/include/versions.wmi
Log:
Conflict resolved phobos. :-)


Modified: website/trunk/include/versions.wmi
===================================================================
--- website/trunk/include/versions.wmi	2008-07-15 04:20:49 UTC (rev 15916)
+++ website/trunk/include/versions.wmi	2008-07-15 04:40:33 UTC (rev 15917)
@@ -179,3 +179,4 @@
 <define-tag package-source-alpha-sig whitespace=delete><package-source-alpha>.asc</define-tag>
 <define-tag package-source-021-sig whitespace=delete><package-source-021>.asc</define-tag>
 
+<define-tag version-torbutton whitespace=delete>1.2.0rc6 (12 Jul 2008)</define-tag>