summaryrefslogtreecommitdiff
path: root/numpy/lib
diff options
context:
space:
mode:
authorCharles Harris <charlesr.harris@gmail.com>2010-08-15 19:11:00 +0000
committerCharles Harris <charlesr.harris@gmail.com>2010-08-15 19:11:00 +0000
commitcc5d13150ce5e03a3523320eeca26e41086a0074 (patch)
treec9ed352aa923d0c2e8b7a81ef5f1315b77f200b0 /numpy/lib
parenta0f3609e88a998626309f63a9d1288fd591de6aa (diff)
downloadnumpy-cc5d13150ce5e03a3523320eeca26e41086a0074.tar.gz
Merge branch 'poly'
Conflicts: numpy/polynomial/chebyshev.py numpy/polynomial/polynomial.py
Diffstat (limited to 'numpy/lib')
-rw-r--r--numpy/lib/npyio.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/numpy/lib/npyio.py b/numpy/lib/npyio.py
index 3881c8882..f37228a22 100644
--- a/numpy/lib/npyio.py
+++ b/numpy/lib/npyio.py
@@ -722,7 +722,7 @@ def savetxt(fname, X, fmt='%.18e', delimiter=' ', newline='\n'):
delimiter : str
Character separating columns.
newline : str
- .. versionadded:: 2.0
+ .. versionadded:: 1.5.0
Character separating lines.