diff options
| author | Petri Lehtinen <petri@digip.org> | 2009-09-14 15:06:06 +0300 |
|---|---|---|
| committer | Petri Lehtinen <petri@digip.org> | 2009-09-14 15:06:06 +0300 |
| commit | 7728716759b73ee95b84c33a922bdc628dc7d2a9 (patch) | |
| tree | 622b70df977d32e726fede31bb16698f2b575665 /doc | |
| parent | 5406c2b3d347505149d382213b6f318f8c35de6a (diff) | |
| parent | b7bf96996f4db14c75499ddb529d5017893ad294 (diff) | |
| download | jansson-7728716759b73ee95b84c33a922bdc628dc7d2a9.zip jansson-7728716759b73ee95b84c33a922bdc628dc7d2a9.tar.gz jansson-7728716759b73ee95b84c33a922bdc628dc7d2a9.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 911436a..3ccd920 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.2+' +release = '1.0.3+' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. |