diff lib/redmine/.svn/text-base/version.rb.svn-base @ 246:eeebe205a056 cannam

* Merge from default branch, bringing us up to SVN trunk rev 4993
author Chris Cannam
date Thu, 03 Mar 2011 12:02:03 +0000
parents cd2282d2aa55 0579821a129a
children 753f1380d6bc
line wrap: on
line diff
--- a/lib/redmine/.svn/text-base/version.rb.svn-base	Thu Jan 20 09:59:02 2011 +0000
+++ b/lib/redmine/.svn/text-base/version.rb.svn-base	Thu Mar 03 12:02:03 2011 +0000
@@ -4,7 +4,7 @@
   module VERSION #:nodoc:
     MAJOR = 1
     MINOR = 1
-    TINY  = 0
+    TINY  = 1
     
     # Branch values:
     # * official release: nil