summaryrefslogtreecommitdiff
path: root/sphinx/pycode
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2011-01-04 11:29:09 +0100
committerGeorg Brandl <georg@python.org>2011-01-04 11:29:09 +0100
commit91f7f969ed843e4edd7c9f0a5403c2a9c9de9833 (patch)
tree7c6e2469c3a80d9712519426a6263a2083088138 /sphinx/pycode
parent8a623b1e53df7c211a2b6989e187d1072377fd5b (diff)
parent901ef024a6309d69bd4e04da2145b97af99cb64e (diff)
downloadsphinx-91f7f969ed843e4edd7c9f0a5403c2a9c9de9833.tar.gz
merge with 1.0
Diffstat (limited to 'sphinx/pycode')
-rw-r--r--sphinx/pycode/__init__.py2
-rw-r--r--sphinx/pycode/nodes.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/sphinx/pycode/__init__.py b/sphinx/pycode/__init__.py
index ef92297c..e4758835 100644
--- a/sphinx/pycode/__init__.py
+++ b/sphinx/pycode/__init__.py
@@ -5,7 +5,7 @@
Utilities parsing and analyzing Python code.
- :copyright: Copyright 2007-2010 by the Sphinx team, see AUTHORS.
+ :copyright: Copyright 2007-2011 by the Sphinx team, see AUTHORS.
:license: BSD, see LICENSE for details.
"""
diff --git a/sphinx/pycode/nodes.py b/sphinx/pycode/nodes.py
index fc6eb93a..7adacc1d 100644
--- a/sphinx/pycode/nodes.py
+++ b/sphinx/pycode/nodes.py
@@ -5,7 +5,7 @@
Parse tree node implementations.
- :copyright: Copyright 2007-2010 by the Sphinx team, see AUTHORS.
+ :copyright: Copyright 2007-2011 by the Sphinx team, see AUTHORS.
:license: BSD, see LICENSE for details.
"""