diff options
| author | robocoder <anthon.pang@gmail.com> | 2010-10-14 13:01:17 +0400 |
|---|---|---|
| committer | robocoder <anthon.pang@gmail.com> | 2010-10-14 13:01:17 +0400 |
| commit | a6af51130b5d59f2c957b459218c152b2c2f06d5 (patch) | |
| tree | b2a91441c0d34fc30164e896d251b8292cb99d53 /js | |
| parent | 2c21f696141c50bdfdb95f69c76effdfaf4341c9 (diff) | |
fixes #1768
git-svn-id: http://dev.piwik.org/svn/trunk@3247 59fd770c-687e-43c8-a1e3-f5a4ff64c105
Diffstat (limited to 'js')
| -rw-r--r-- | js/LICENSE.txt | 29 | ||||
| -rw-r--r-- | js/piwik.js | 5 |
2 files changed, 33 insertions, 1 deletions
diff --git a/js/LICENSE.txt b/js/LICENSE.txt new file mode 100644 index 0000000000..720761bc34 --- /dev/null +++ b/js/LICENSE.txt @@ -0,0 +1,29 @@ +Copyright 2010 Anthon Pang +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + +* Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + +* Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + +* Neither the name of Anthon Pang nor the names of its contributors + may be used to endorse or promote products derived from this + software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +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. diff --git a/js/piwik.js b/js/piwik.js index 13caf53ad1..979e50786d 100644 --- a/js/piwik.js +++ b/js/piwik.js @@ -1,8 +1,11 @@ /*! * Piwik - Web Analytics * + * JavaScript tracking client + * * @link http://piwik.org - * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later + * @source http://dev.piwik.org/trac/browser/trunk/js/piwik.js + * @license http://www.opensource.org/licenses/bsd-license.php Simplified BSD * @version $Id$ */ |