diff options
| author | Petri Lehtinen <petri@digip.org> | 2009-09-06 12:53:38 +0300 |
|---|---|---|
| committer | Petri Lehtinen <petri@digip.org> | 2009-09-06 12:53:38 +0300 |
| commit | fd259ff68c095c613acf952cc63407f294241923 (patch) | |
| tree | 7a6f444415386d8019e51c9604c21a42159b9272 /doc | |
| parent | 9611780907cdb0154bd41232df7b2a41903a4ca5 (diff) | |
| parent | ab2d93b72486eda30e868b226bec5dcd5ec3273e (diff) | |
| download | jansson-fd259ff68c095c613acf952cc63407f294241923.zip jansson-fd259ff68c095c613acf952cc63407f294241923.tar.gz jansson-fd259ff68c095c613acf952cc63407f294241923.tar.bz2 | |
Merge branch '1.0'
Conflicts:
configure.ac
doc/conf.py
Diffstat (limited to 'doc')
| -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 7629a03..bd88c6b 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.0' # The full version, including alpha/beta/rc tags. -release = '1.0+' +release = '1.0.1+' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. |