merge from 4.0.0 to trunk

svn: r20824
This commit is contained in:
Jérôme Rapinat
2012-12-22 18:07:18 +00:00
parent 261df75bea
commit 424fe3bd5b
13 changed files with 140 additions and 119 deletions

View File

@ -48,9 +48,9 @@ copyright = u'2012, Gramps project'
# built documents.
#
# The short X.Y version.
version = '4.0'
version = '4.1'
# The full version, including alpha/beta/rc tags.
release = '4.0.0'
release = 'trunk'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.