Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
authormattab <matthieu.aubry@gmail.com>2013-03-13 05:20:31 +0400
committermattab <matthieu.aubry@gmail.com>2013-03-13 05:20:31 +0400
commitab408dc311ceb5703b51f0d9f38dc9aa6c2208fe (patch)
treed3e323b46bb9a345d8a62e26d4f4e7b0a5b8c854 /js
parentb4201236cfee91cb2742d06a4e876b53f737f28d (diff)
Updating the LICENSE.txt and license notice to link to piwik.org page at: http://piwik.org/free-software/bsd/
Anthon I moved your name to the page on the site. the page on opensource.org was not ideal and explaining well the situation.
Diffstat (limited to 'js')
-rw-r--r--js/LICENSE.txt5
-rw-r--r--js/piwik.js2
2 files changed, 5 insertions, 2 deletions
diff --git a/js/LICENSE.txt b/js/LICENSE.txt
index 720761bc34..ab78cf9da6 100644
--- a/js/LICENSE.txt
+++ b/js/LICENSE.txt
@@ -1,4 +1,5 @@
-Copyright 2010 Anthon Pang
+Copyright (c) Piwik and contributors
+
All rights reserved.
Redistribution and use in source and binary forms, with or without
@@ -27,3 +28,5 @@ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+View online: http://piwik.org/free-software/bsd/ \ No newline at end of file
diff --git a/js/piwik.js b/js/piwik.js
index 3c7b989f87..18c6d7706e 100644
--- a/js/piwik.js
+++ b/js/piwik.js
@@ -5,7 +5,7 @@
*
* @link http://piwik.org
* @source https://github.com/piwik/piwik/blob/master/js/piwik.js
- * @license http://www.opensource.org/licenses/bsd-license.php Simplified BSD
+ * @license http://piwik.org/free-software/bsd/ Simplified BSD (also in js/LICENSE.txt)
*/
// Refer to README for build instructions when minifying this file for distribution.