Merged r3854 from trunk.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3856 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/lib/redmine/version.rb b/lib/redmine/version.rb
index 65aaf4bd51131c4bf3c9fb39b7b75d15c9a36bce..5ea62f3e002c394c8a145eab3d0c5aef8f753e1f 100644 (file)
--- a/lib/redmine/version.rb
+++ b/lib/redmine/version.rb
@@ -2,9 +2,9 @@ require 'rexml/document'
 
 module Redmine
   module VERSION #:nodoc:
-    MAJOR = 0
-    MINOR = 9
-    TINY  = 6
+    MAJOR = 1
+    MINOR = 0
+    TINY  = 0
     
     # Branch values:
     # * official release: nil