summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormartinko2014-04-09 15:22:50 +0000
committermartinko2014-04-09 15:22:50 +0000
commit7bd09d7745e9d0b9db638eb4dc8caf4346112fe6 (patch)
treefa62ae624ff42776a74551cbbdbab94e9f42c869
parent07c560c5f3a8b51cb4a492bff8af191fb60edc9a (diff)
parentbbcd65e4e74e705e0cc07a549bda73e37e20012a (diff)
Merge commit 'bbcd65e4e74e705e0cc07a549bda73e37e20012a' into hotfix/3.2.1
-rwxr-xr-xsetup_pkgloader.py2
-rwxr-xr-xsetup_skytools.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/setup_pkgloader.py b/setup_pkgloader.py
index 28b15d73..41669861 100755
--- a/setup_pkgloader.py
+++ b/setup_pkgloader.py
@@ -4,7 +4,7 @@ from distutils.core import setup
setup(
name = "pkgloader",
- license = "BSD",
+ license = "ISC",
version = '1.0',
maintainer = "Marko Kreen",
maintainer_email = "[email protected]",
diff --git a/setup_skytools.py b/setup_skytools.py
index 54a623a9..ce52e250 100755
--- a/setup_skytools.py
+++ b/setup_skytools.py
@@ -193,7 +193,7 @@ if BUILD_C_MOD:
# run actual setup
setup(
name = "skytools",
- license = "BSD",
+ license = "ISC",
version = ac_ver,
maintainer = "Marko Kreen",
maintainer_email = "[email protected]",