Merged with WordPress 2.5, unstable, only for testing

git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@1218 7be80a69-a1ef-0310-a953-fb0f7c49ff36

1 files changed, 17 insertions, 4 deletions

diff --git a/wp-includes/version.php b/wp-includes/version.php
index f691583..7078f98 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -1,9 +1,22 @@
 <?php
+/**
+ * This holds the version number in a separate file so we can bump it without cluttering the SVN
+ */
 
-// This holds the version number in a separate file so we can bump it without cluttering the SVN
+/**
+ * The WordPress version string
+ *
+ * @global string $wp_version
+ */
+$wp_version = '2.5';
 
-$wp_version = '2.3.3';
-$wpmu_version = '1.3.3';
-$wp_db_version = 6124;
+/**
+ * Holds the WordPress DB revision, increments when changes are made to the WordPress DB scheme
+ * changes.
+ *
+ * @global int $wp_db_version
+ */
+$wp_db_version = 7558;
 
+$wpmu_version = '1.5-RC1';
 ?>