summaryrefslogtreecommitdiff
path: root/doc/source
diff options
context:
space:
mode:
authorCharles Harris <charlesr.harris@gmail.com>2016-01-19 19:53:20 -0700
committerCharles Harris <charlesr.harris@gmail.com>2016-01-19 19:53:20 -0700
commit11a9b710481f5932835c1c0cb1e5e2747be8cde0 (patch)
tree9f94c71f251e4ae8c469614909bbc7bc495ecb76 /doc/source
parent58089f3ef9e18f3a4f7634e1b84eebefd45605f8 (diff)
downloadnumpy-11a9b710481f5932835c1c0cb1e5e2747be8cde0.tar.gz
REL: Update master branch after 1.12.x branch has been made.
* Drop testing of Python 2.6, 3.2, and 3.3 * Create 1.12.0-notes.rst and add to source/documentation. * Update pavement.py to use 1.10.x as LOG_START * Update version numpy in setup.py
Diffstat (limited to 'doc/source')
-rw-r--r--doc/source/release.rst1
1 files changed, 1 insertions, 0 deletions
diff --git a/doc/source/release.rst b/doc/source/release.rst
index 6da61763f..1801b2067 100644
--- a/doc/source/release.rst
+++ b/doc/source/release.rst
@@ -2,6 +2,7 @@
Release Notes
*************
+.. include:: ../release/1.12.0-notes.rst
.. include:: ../release/1.11.0-notes.rst
.. include:: ../release/1.10.4-notes.rst
.. include:: ../release/1.10.3-notes.rst