Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Update version numbers

  • Loading branch information...
commit e5b6317bbfa73b4532bb4c605d97ccd5ac860e6d 1 parent dd3d68e
@mdboom mdboom authored
Showing with 11 additions and 11 deletions.
  1. +10 −10 LICENSE/LICENSE
  2. +1 −1  lib/matplotlib/__init__.py
View
20 LICENSE/LICENSE
@@ -1,4 +1,4 @@
-LICENSE AGREEMENT FOR MATPLOTLIB 1.1.0
+LICENSE AGREEMENT FOR MATPLOTLIB 1.2.0
--------------------------------------
1. This LICENSE AGREEMENT is between John D. Hunter ("JDH"), and the
@@ -9,30 +9,30 @@ documentation.
2. Subject to the terms and conditions of this License Agreement, JDH
hereby grants Licensee a nonexclusive, royalty-free, world-wide license
to reproduce, analyze, test, perform and/or display publicly, prepare
-derivative works, distribute, and otherwise use matplotlib 1.1.0
+derivative works, distribute, and otherwise use matplotlib 1.2.0
alone or in any derivative version, provided, however, that JDH's
License Agreement and JDH's notice of copyright, i.e., "Copyright (c)
2002-2011 John D. Hunter; All Rights Reserved" are retained in
-matplotlib 1.1.0 alone or in any derivative version prepared by
+matplotlib 1.2.0 alone or in any derivative version prepared by
Licensee.
3. In the event Licensee prepares a derivative work that is based on or
-incorporates matplotlib 1.1.0 or any part thereof, and wants to
+incorporates matplotlib 1.2.0 or any part thereof, and wants to
make the derivative work available to others as provided herein, then
Licensee hereby agrees to include in any such work a brief summary of
-the changes made to matplotlib 1.1.0.
+the changes made to matplotlib 1.2.0.
-4. JDH is making matplotlib 1.1.0 available to Licensee on an "AS
+4. JDH is making matplotlib 1.2.0 available to Licensee on an "AS
IS" basis. JDH MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, JDH MAKES NO AND
DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
-FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF MATPLOTLIB 1.1.0
+FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF MATPLOTLIB 1.2.0
WILL NOT INFRINGE ANY THIRD PARTY RIGHTS.
5. JDH SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF MATPLOTLIB
-1.1.0 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR
+1.2.0 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR
LOSS AS A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING
-MATPLOTLIB 1.1.0, OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF
+MATPLOTLIB 1.2.0, OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF
THE POSSIBILITY THEREOF.
6. This License Agreement will automatically terminate upon a material
@@ -44,6 +44,6 @@ Licensee. This License Agreement does not grant permission to use JDH
trademarks or trade name in a trademark sense to endorse or promote
products or services of Licensee, or any third party.
-8. By copying, installing or otherwise using matplotlib 1.1.0,
+8. By copying, installing or otherwise using matplotlib 1.2.0,
Licensee agrees to be bound by the terms and conditions of this License
Agreement.
View
2  lib/matplotlib/__init__.py
@@ -99,7 +99,7 @@
"""
from __future__ import print_function
-__version__ = '1.2.0rc2'
+__version__ = '1.2.0rc3'
__version__numpy__ = '1.4' # minimum required numpy version
import os, re, shutil, subprocess, sys, warnings
Please sign in to comment.
Something went wrong with that request. Please try again.