comparison lib/redmine/.svn/text-base/version.rb.svn-base @ 508:851510f1b535 cannam

Merge from branch "redmine-1.2"
author Chris Cannam
date Thu, 14 Jul 2011 10:37:36 +0100
parents 753f1380d6bc 0c939c159af4
children
comparison
equal deleted inserted replaced
506:1551c61843d2 508:851510f1b535
2 2
3 module Redmine 3 module Redmine
4 module VERSION #:nodoc: 4 module VERSION #:nodoc:
5 MAJOR = 1 5 MAJOR = 1
6 MINOR = 2 6 MINOR = 2
7 TINY = 0 7 TINY = 1
8 8
9 # Branch values: 9 # Branch values:
10 # * official release: nil 10 # * official release: nil
11 # * stable branch: stable 11 # * stable branch: stable
12 # * trunk: devel 12 # * trunk: devel