Merge branch 'v1.9'

Conflicts: doc/source/install.rst
FedericoV · Jun 23, 2014 · 9bd0b8e · 9bd0b8e
2 parents 7fca822 + cf6ce26
commit 9bd0b8e
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1,5 +1,4 @@
 include MANIFEST.in
-include setup_egg.py
 include setup.py
 include INSTALL.txt
 include LICENSE.txt
@@ -19,8 +18,6 @@ include networkx/*/*/tests/*.A99
 include networkx/*/*/tests/*.B99
 include networkx/*/*/tests/*.bz2
 
-include networkx/external/decorator/*/*.py
-
 global-exclude *~
 global-exclude *.pyc
 global-exclude .svn

diff --git a/doc/source/reference/news.rst b/doc/source/reference/news.rst
@@ -12,7 +12,7 @@ Support for Python 2.6 is dropped in this release.
 
 NetworkX 1.9
 ------------
-Release date: TBD
+Release date: 21 June 2014
 
 Support for Python 3.1 is dropped in this release.