Skip to content
This repository
Browse code

Update version numbers

  • Loading branch information...
commit e5b6317bbfa73b4532bb4c605d97ccd5ac860e6d 1 parent dd3d68e
Michael Droettboom authored October 30, 2012
20  LICENSE/LICENSE
... ...
@@ -1,4 +1,4 @@
1  
-LICENSE AGREEMENT FOR MATPLOTLIB 1.1.0
  1
+LICENSE AGREEMENT FOR MATPLOTLIB 1.2.0
2 2
 --------------------------------------
3 3
 
4 4
 1. This LICENSE AGREEMENT is between John D. Hunter ("JDH"), and the
@@ -9,30 +9,30 @@ documentation.
9 9
 2. Subject to the terms and conditions of this License Agreement, JDH
10 10
 hereby grants Licensee a nonexclusive, royalty-free, world-wide license
11 11
 to reproduce, analyze, test, perform and/or display publicly, prepare
12  
-derivative works, distribute, and otherwise use matplotlib 1.1.0
  12
+derivative works, distribute, and otherwise use matplotlib 1.2.0
13 13
 alone or in any derivative version, provided, however, that JDH's
14 14
 License Agreement and JDH's notice of copyright, i.e., "Copyright (c)
15 15
 2002-2011 John D. Hunter; All Rights Reserved" are retained in
16  
-matplotlib 1.1.0 alone or in any derivative version prepared by
  16
+matplotlib 1.2.0 alone or in any derivative version prepared by
17 17
 Licensee.
18 18
 
19 19
 3. In the event Licensee prepares a derivative work that is based on or
20  
-incorporates matplotlib 1.1.0 or any part thereof, and wants to
  20
+incorporates matplotlib 1.2.0 or any part thereof, and wants to
21 21
 make the derivative work available to others as provided herein, then
22 22
 Licensee hereby agrees to include in any such work a brief summary of
23  
-the changes made to matplotlib 1.1.0.
  23
+the changes made to matplotlib 1.2.0.
24 24
 
25  
-4. JDH is making matplotlib 1.1.0 available to Licensee on an "AS
  25
+4. JDH is making matplotlib 1.2.0 available to Licensee on an "AS
26 26
 IS" basis.  JDH MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
27 27
 IMPLIED.  BY WAY OF EXAMPLE, BUT NOT LIMITATION, JDH MAKES NO AND
28 28
 DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
29  
-FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF MATPLOTLIB 1.1.0
  29
+FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF MATPLOTLIB 1.2.0
30 30
 WILL NOT INFRINGE ANY THIRD PARTY RIGHTS.
31 31
 
32 32
 5. JDH SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF MATPLOTLIB
33  
-1.1.0 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR
  33
+1.2.0 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR
34 34
 LOSS AS A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING
35  
-MATPLOTLIB 1.1.0, OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF
  35
+MATPLOTLIB 1.2.0, OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF
36 36
 THE POSSIBILITY THEREOF.
37 37
 
38 38
 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
44 44
 trademarks or trade name in a trademark sense to endorse or promote
45 45
 products or services of Licensee, or any third party.
46 46
 
47  
-8. By copying, installing or otherwise using matplotlib 1.1.0,
  47
+8. By copying, installing or otherwise using matplotlib 1.2.0,
48 48
 Licensee agrees to be bound by the terms and conditions of this License
49 49
 Agreement.
2  lib/matplotlib/__init__.py
@@ -99,7 +99,7 @@
99 99
 """
100 100
 from __future__ import print_function
101 101
 
102  
-__version__  = '1.2.0rc2'
  102
+__version__  = '1.2.0rc3'
103 103
 __version__numpy__ = '1.4' # minimum required numpy version
104 104
 
105 105
 import os, re, shutil, subprocess, sys, warnings

0 notes on commit e5b6317

Please sign in to comment.
Something went wrong with that request. Please try again.