Skip to content

Commit

Permalink
Merge branch 'master' of github.com:eassmann/prima.py
Browse files Browse the repository at this point in the history
  • Loading branch information
eassmann committed Nov 13, 2015
2 parents 98724ef + 90c15a6 commit 95837dd
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 2 deletions.
12 changes: 11 additions & 1 deletion LICENSE → COPYING
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@
prima.py is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 2 of the License (reproduced
below), or (at your option) any later version.

It is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.


GNU GENERAL PUBLIC LICENSE
Version 2, June 1991

Expand Down Expand Up @@ -337,4 +348,3 @@ proprietary programs. If your program is a subroutine library, you may
consider it more useful to permit linking proprietary applications with the
library. If this is what you want to do, use the GNU Lesser General
Public License instead of this License.

2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

# prima.py 1.0-rc1
# prima.py 0.3


USAGE
Expand Down

0 comments on commit 95837dd

Please sign in to comment.