diff options
| author | Petri Lehtinen <petri@digip.org> | 2009-10-11 21:51:54 +0300 |
|---|---|---|
| committer | Petri Lehtinen <petri@digip.org> | 2009-10-11 21:51:54 +0300 |
| commit | ca7703fbd127a6279e9842a843f317a639db87e2 (patch) | |
| tree | 60438f2bd9b15897775bb54faeea5f54dab13d0e /doc | |
| parent | 1e00cd58a514a61e829e639f1e40dac94a334561 (diff) | |
| parent | 12cd4e8c093476b596012a7f5f4840fac69d1605 (diff) | |
| download | jansson-ca7703fbd127a6279e9842a843f317a639db87e2.zip jansson-ca7703fbd127a6279e9842a843f317a639db87e2.tar.gz jansson-ca7703fbd127a6279e9842a843f317a639db87e2.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 3ccd920..16d9c80 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.3+' +release = '1.0.4+' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. |