From cc5d13150ce5e03a3523320eeca26e41086a0074 Mon Sep 17 00:00:00 2001
From: Charles Harris <charlesr.harris@gmail.com>
Date: Sun, 15 Aug 2010 19:11:00 +0000
Subject: Merge branch 'poly'

Conflicts:
	numpy/polynomial/chebyshev.py
	numpy/polynomial/polynomial.py
---
 numpy/lib/npyio.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'numpy/lib')

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.
 
-- 
cgit v1.2.1