[redeclipse] 146/494: Shove all trademarks under one copyright section

[Martin Werner]

This is an automated email from the git hooks/post-receive script.

arand-guest pushed a commit to branch debdir
in repository redeclipse.

commit b77d9e814185194e7fdd0e7fc401eaa1d16faf34
Author: Arand Nash <ienorand at gmail.com>
Date:   Wed Mar 30 14:33:27 2011 +0100

    Shove all trademarks under one copyright section
---
 copyright | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/copyright b/copyright
index 66ccb4c..bea35f8 100644
--- a/copyright
+++ b/copyright
@@ -223,7 +223,8 @@ License:
 
 Files: src/redeclipse.ico src/install/large.gif
        src/redeclipse.ico src/install/small.gif src/site/*
-Copyright: Copyright UNKNOWN
+       data/textures/emblem.png data/textures/logo.png
+Copyright: Copyright Copyright (C) 2010 Red Eclipse Team
 License:
  Use of any logos, trademarks, or other advertising/promotional material
  for Red Eclipse are free to use without consent, when used in conjunction with
@@ -321,17 +322,6 @@ License:
        reditributed.
 Comment: *.png files are generated from akashi.ttf using ttf2font
 
-Files: data/textures/emblem.png data/textures/logo.png
-Copyright: Copyright (C) 2010 Red Eclipse Team
-License:
- Created by Luckystrike-Rx for Red Eclipse
- Copyright (C) 2010 Red Eclipse Team
- Use of any logos, trademarks, or other advertising/promotional material
- for Red Eclipse are free to use without consent, when used in conjunction with
- a Red Eclipse article, comment, review, or advertisement; regardless of the
- media featured in said material. Use for any other reason is strictly
- prohibited without express written consent of Red Eclipse.
-
 Files: data/textures/wait.png
 Copyright: Copyright 2008 Kaneiderdaniel
            (http://commons.wikimedia.org/wiki/User:Kaneiderdaniel)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/redeclipse.git