summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKarl 'vollmerk' Vollmer <vollmer@ampache.org>2008-01-06 10:03:47 +0000
committerKarl 'vollmerk' Vollmer <vollmer@ampache.org>2008-01-06 10:03:47 +0000
commitf5d4dc8c3b349190f55b3acf41852684e37f2daf (patch)
tree4fa2f95046f913975cd330057d33eba8329ac42d
parentbff01c23abdf3f83c3fdfe1575dff44869feb33e (diff)
downloadampache-f5d4dc8c3b349190f55b3acf41852684e37f2daf.tar.gz
ampache-f5d4dc8c3b349190f55b3acf41852684e37f2daf.tar.bz2
ampache-f5d4dc8c3b349190f55b3acf41852684e37f2daf.zip
few more copyright updates
-rw-r--r--locale/base/messages.po4
-rw-r--r--modules/flash/LICENSE25
-rw-r--r--modules/flash/crossdomain.xml20
-rw-r--r--themes/greysme/templates/default.css2
4 files changed, 42 insertions, 9 deletions
diff --git a/locale/base/messages.po b/locale/base/messages.po
index b5f8f051..3e2ea20e 100644
--- a/locale/base/messages.po
+++ b/locale/base/messages.po
@@ -1,7 +1,7 @@
# Translations Base.
-# Copyright (C) 2007 Ampache.org
+# Copyright (C) 2008 Ampache.org
# This file is distributed under the same license as the Ampache package.
-# Fuzzy <EMAIL@ADDRESS>, 2007.
+# LL <LL@li.org>, 2007.
#
#, fuzzy
msgid ""
diff --git a/modules/flash/LICENSE b/modules/flash/LICENSE
index 12820eee..bacd9c39 100644
--- a/modules/flash/LICENSE
+++ b/modules/flash/LICENSE
@@ -1,10 +1,25 @@
Copyright (c) 2007, Lacy Morrow
All rights reserved.
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+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 the author nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+ * 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 the author 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.
+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/modules/flash/crossdomain.xml b/modules/flash/crossdomain.xml
index 9f8d775d..f7f2044c 100644
--- a/modules/flash/crossdomain.xml
+++ b/modules/flash/crossdomain.xml
@@ -1,6 +1,24 @@
+<!-- Copyright (c) 2001 - 2008 Ampache.org
+ All rights reserved.
+
+ This program 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, or (at your option) any later version.
+
+ This program 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.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -->
+
+
<?xml version="1.0"?>
<!DOCTYPE cross-domain-policy
SYSTEM "http://www.macromedia.com/xml/dtds/cross-domain-policy.dtd">
<cross-domain-policy>
<allow-access-from domain="*" />
-</cross-domain-policy> \ No newline at end of file
+</cross-domain-policy>
diff --git a/themes/greysme/templates/default.css b/themes/greysme/templates/default.css
index fdeb292c..062d23ae 100644
--- a/themes/greysme/templates/default.css
+++ b/themes/greysme/templates/default.css
@@ -4,7 +4,7 @@
All rights reserved.
This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
+ modify it under the terms of the GNU General Public License v2
as published by the Free Software Foundation; either version
of the License, or (at your option) any later version.