aboutsummaryrefslogtreecommitdiff
path: root/bindings/python/docs/source/conf.py
diff options
context:
space:
mode:
authorCarl Worth <cworth@cworth.org>2010-04-27 11:40:26 -0700
committerCarl Worth <cworth@cworth.org>2010-04-27 11:40:26 -0700
commit229292a4b25cc776349ab1c461392a69301733c7 (patch)
treea5eafd225bc45872c9c1b9840015ea23b7547307 /bindings/python/docs/source/conf.py
parent9d365fb5ad570a90d53f8ad70cb29c2defbc7018 (diff)
parent2baa5769a3339b6b866c0f1bbf40006a6eae9808 (diff)
Merge branch '0.3.x'
This doesn't pull in any code, (everything in 0.3.x was originally cherry-picked from master anyway). But the merge does give us a correct NEWS file showing which fixes are included in 0.3.1 and which features have been commited "since" then, (topologically, not chronologically).
Diffstat (limited to 'bindings/python/docs/source/conf.py')
0 files changed, 0 insertions, 0 deletions