Skip to content

Commit

Permalink
ライセンス関係のファイルを修正
Browse files Browse the repository at this point in the history
  • Loading branch information
upsilon committed Mar 29, 2012
1 parent 8eabbf8 commit 84a82ab
Show file tree
Hide file tree
Showing 4 changed files with 68 additions and 122 deletions.
34 changes: 34 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
Copyright
---------

OpenTween Project:

Copyright (C) 2011 kim_upsilon <[email protected]>
Copyright (C) 2011 Egtra <http://dev.activebasic.com/egtra/>
Copyright (C) 2011 spinor <http://d.hatena.ne.jp/spinor/>
Copyright (C) 2011 tigree4th <[email protected]>

Tween Authors:

Copyright (C) 2007 kiri_feather <[email protected]>
Copyright (C) 2008 Moz <http://twitter.com/syo68k>
Copyright (C) 2008 takeshik <http://www.takeshik.org/>
Copyright (C) 2010 anis774 <http://d.hatena.ne.jp/anis774/>
Copyright (C) 2010 fantasticswallow <http://twitter.com/f_swallow>


License
-------

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 3 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.

The complete text of the GNU General Public License version 3 can be found in
the `LICENSE.GPL-3' file.

78 changes: 0 additions & 78 deletions LICENSE.txt → LICENSE.GPL-3
Original file line number Diff line number Diff line change
@@ -1,79 +1,3 @@
ACKNOWLEDGEMENT:

In this software, below icon files in Tween/Resources directory:
1o.ico
2b.ico
3b.ico
4b.ico
4r.ico
4y.ico
5b.ico
5o.ico
5r.ico
5y.ico
6b.ico
6o.ico
re.ico
re2.ico
re3.ico
re4.ico
InitialImage.png
MultiMediaImage.png
was created by Minami <http://www.pi-kun.com/>.
These files are NOT licensed under the GNU General Public License (GPL).
Please inquire about these files not to copyright holders of Tween, but
to the author of the icons.

In this software, below files in Tween directory:
Dynamic.vb
is made by Microsoft Corporation, and distributed on Microsoft Public License(Ms-PL).


Microsoft Public License (Ms-PL)

This license governs use of the accompanying software. If you use the software, you accept this
license. If you do not accept the license, do not use the software.

1. Definitions
The terms "reproduce," "reproduction," "derivative works," and "distribution" have the same meaning
here as under U.S. copyright law.
A "contribution" is the original software, or any additions or changes to the software.
A "contributor" is any person that distributes its contribution under this license.
"Licensed patents" are a contributor's patent claims that read directly on its contribution.

2. Grant of Rights
(A) Copyright Grant- Subject to the terms of this license, including the license conditions and
limitations in section 3, each contributor grants you a non-exclusive, worldwide, royalty-free
copyright license to reproduce its contribution, prepare derivative works of its contribution, and
distribute its contribution or any derivative works that you create.
(B) Patent Grant- Subject to the terms of this license, including the license conditions and
limitations in section 3, each contributor grants you a non-exclusive, worldwide, royalty-free
license under its licensed patents to make, have made, use, sell, offer for sale, import, and/or
otherwise dispose of its contribution in the software or derivative works of the contribution in the
software.

3. Conditions and Limitations
(A) No Trademark License- This license does not grant you rights to use any contributors' name,
logo, or trademarks.
(B) If you bring a patent claim against any contributor over patents that you claim are infringed by
the software, your patent license from such contributor to the software ends automatically.
(C) If you distribute any portion of the software, you must retain all copyright, patent, trademark,
and attribution notices that are present in the software.
(D) If you distribute any portion of the software in source code form, you may do so only under this
license by including a complete copy of this license with your distribution. If you distribute any
portion of the software in compiled or object code form, you may only do so under a license that
complies with this license.
(E) The software is licensed "as-is." You bear the risk of using it. The contributors give no
express warranties, guarantees or conditions. You may have additional consumer rights under your
local laws which this license cannot change. To the extent permitted under your local laws, the
contributors exclude the implied warranties of merchantability, fitness for a particular purpose and
non-infringement.



END OF ACKNOWLEDGEMENT. BELOW IS THE LICENSE OF CODES OF THE SOFTWARE.


GNU GENERAL PUBLIC LICENSE
Version 3, 29 June 2007

Expand Down Expand Up @@ -748,5 +672,3 @@ may consider it more useful to permit linking proprietary applications with
the library. If this is what you want to do, use the GNU Lesser General
Public License instead of this License. But first, please read
<http://www.gnu.org/philosophy/why-not-lgpl.html>.


34 changes: 34 additions & 0 deletions LICENSE.ja
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
コピーライト
------------

OpenTweenプロジェクト:

Copyright (C) 2011 kim_upsilon <[email protected]>
Copyright (C) 2011 Egtra <http://dev.activebasic.com/egtra/>
Copyright (C) 2011 spinor <http://d.hatena.ne.jp/spinor/>
Copyright (C) 2011 tigree4th <[email protected]>

Tween著作者:

Copyright (C) 2007 kiri_feather <[email protected]>
Copyright (C) 2008 Moz <http://twitter.com/syo68k>
Copyright (C) 2008 takeshik <http://www.takeshik.org/>
Copyright (C) 2010 anis774 <http://d.hatena.ne.jp/anis774/>
Copyright (C) 2010 fantasticswallow <http://twitter.com/f_swallow>

ライセンス
----------

本プログラムはフリーソフトウェアです。あなたはこれを、GNU General Public
License (GNU 一般公衆利用許諾書) バージョン 3 またはそれ以降のバージョンが定
める条件下で再配布または改変することができます。

このプログラムは現状有姿のまま、いかなる保証もなく提供されます。プログラムの
品質や性能に関するすべてのリスクはあなたに帰属します。詳しくはライセンス本文
を参照して下さい。

ライセンスの完全なコピーは LICENSE.GPL-3 ファイルにあります。

また、ライセンスの *非公式な* 日本語訳は、
http://sourceforge.jp/magazine/07/09/02/130237 にて公開されています。

44 changes: 0 additions & 44 deletions LICENSE.ja.txt

This file was deleted.

0 comments on commit 84a82ab

Please sign in to comment.