merge with 0.6

This commit is contained in:
Georg Brandl
2009-12-31 09:49:12 +01:00
5 changed files with 10 additions and 4 deletions

View File

@@ -49,6 +49,9 @@ Release 1.0 (in development)
Release 0.6.4 (in development)
==============================
* #303: ``html_context`` values given on the command line via ``-A``
should not override other values given in conf.py.
* Fix a bug preventing incremental rebuilds for the ``dirhtml``
builder.