diff options
| author | Petri Lehtinen <petri@digip.org> | 2009-11-08 22:01:02 +0200 |
|---|---|---|
| committer | Petri Lehtinen <petri@digip.org> | 2009-11-08 22:01:02 +0200 |
| commit | e0a88d19d1f103c32bbaf4c20a83575413c4bf80 (patch) | |
| tree | 8ae7bd04df1adec1e5f1824f0ba0ecc93054be51 /doc/conf.py | |
| parent | 17d913307e60d1c3e41d01d9a4be81892d610b3f (diff) | |
| parent | 842bc2128b70e5390cacf83a24375cd5c0d0341c (diff) | |
| download | jansson-e0a88d19d1f103c32bbaf4c20a83575413c4bf80.zip jansson-e0a88d19d1f103c32bbaf4c20a83575413c4bf80.tar.gz jansson-e0a88d19d1f103c32bbaf4c20a83575413c4bf80.tar.bz2 | |
Merge branch '1.1'
Conflicts:
configure.ac
doc/conf.py
Diffstat (limited to 'doc/conf.py')
| -rw-r--r-- | doc/conf.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/conf.py b/doc/conf.py index 02b4c79..c13315a 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -52,7 +52,7 @@ copyright = u'2009, Petri Lehtinen' # The short X.Y version. version = '1.1' # The full version, including alpha/beta/rc tags. -release = '1.1.1+' +release = '1.1.2+' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. |