FGCOM/jansson
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '1.1'

Browse Source 
Conflicts:
	CHANGES
	configure.ac
	doc/conf.py
This commit is contained in:
Petri Lehtinen
2009-10-26 21:33:03 +02:00
parent 5ff8ae8052 15d992cb6a
commit d1b07171cc
5 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
doc/Makefile.am
View File

@@ -1,4 +1,6 @@
EXTRA_DIST = conf.py apiref.rst index.rst ext/refcounting.py
EXTRA_DIST = \
conf.py apiref.rst gettingstarted.rst github_commits.c index.rst \
tutorial.rst ext/refcounting.py
clean-local:
rm -rf .build

2
doc/conf.py
View File

@@ -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+'
release = '1.1.1+'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.