diff lib/redmine/version.rb @ 514:7eba09d624db live

Merge

--- a/lib/redmine/version.rb	Thu Jul 14 10:46:20 2011 +0100
+++ b/lib/redmine/version.rb	Thu Jul 14 10:50:53 2011 +0100
@@ -3,14 +3,14 @@
 module Redmine
   module VERSION #:nodoc:
     MAJOR = 1
-    MINOR = 0
-    TINY  = 3
-    
+    MINOR = 2
+    TINY  = 1
+
     # Branch values:
     # * official release: nil
     # * stable branch:    stable
     # * trunk:            devel
-    BRANCH = 'devel'
+    BRANCH = 'stable'
 
     def self.revision
       revision = nil
@@ -20,24 +20,25 @@
           f = File.open(entries_path, 'r')
           entries = f.read
           f.close
-     	  if entries.match(%r{^\d+})
-     	    revision = $1.to_i if entries.match(%r{^\d+\s+dir\s+(\d+)\s})
-     	  else
-   	        xml = REXML::Document.new(entries)
-   	        revision = xml.elements['wc-entries'].elements[1].attributes['revision'].to_i
-   	      end
-   	    rescue
-   	      # Could not find the current revision
-   	    end
- 	  end
- 	  revision
+          if entries.match(%r{^\d+})
+            revision = $1.to_i if entries.match(%r{^\d+\s+dir\s+(\d+)\s})
+          else
+            xml = REXML::Document.new(entries)
+            revision =
+              xml.elements['wc-entries'].elements[1].attributes['revision'].to_i
+          end
+        rescue
+          # Could not find the current revision
+        end
+      end
+      revision
     end
 
     REVISION = self.revision
-    ARRAY = [MAJOR, MINOR, TINY, BRANCH, REVISION].compact
-    STRING = ARRAY.join('.')
+    ARRAY    = [MAJOR, MINOR, TINY, BRANCH, REVISION].compact
+    STRING   = ARRAY.join('.')
     
-    def self.to_a; ARRAY end
+    def self.to_a; ARRAY  end
     def self.to_s; STRING end    
   end
 end