Skip to content
Browse files

Added licensing files

Licensing HAS changed, this has been discussed heavily in the dev group and approved by all the contributors. 

All the source is licensed under the GPL v3 License 
In addition: MediaBrowser/Library and MediaBrowserTests are licensed under the MIT license.

git-svn-id: https://videobrowser.googlecode.com/svn/trunk@1038 096cc86f-8a4c-0410-9b85-8b5e0eee1c45
  • Loading branch information...
1 parent 7adf92f commit 189385ea1b51e5e793627102eb1fa88fc83951fd sam.saffron committed
View
17 LICENSE.txt
@@ -0,0 +1,17 @@
+IMPORTANT NOTE: the files in MediaBrowser\Library and TestMediaBrowser are available under the less restrictive MIT license as well
+
+Media Browser
+Copyright (C) 2009 Sam Saffron
+
+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.
+
+You should have received a copy of the GNU General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.
View
5 MediaBrowser.sln
@@ -13,6 +13,11 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DvrmsMetadataProvider", "Dv
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FilmTrailerPlugin", "FilmTrailerPlugin\FilmTrailerPlugin.csproj", "{35EBAE61-52FD-4217-8B53-0757C9E1BB6A}"
EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{5165DE70-E8D8-4A3C-BF07-4429BAF4F802}"
+ ProjectSection(SolutionItems) = preProject
+ LICENSE.txt = LICENSE.txt
+ EndProjectSection
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
View
18 MediaBrowser/Library/LICENSE.txt
@@ -0,0 +1,18 @@
+(This copyright applies to all files in the MediaBrowser/Library directory and below)
+
+Copyright (c) 2005-2009 Sam Saffron
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
View
1 MediaBrowser/MediaBrowser.csproj
@@ -464,6 +464,7 @@
<Content Include="Images\Weather\9.png" />
<Content Include="Images\Weather\readme.txt" />
<Content Include="Images\zoompane.png" />
+ <Content Include="Library\LICENSE.txt" />
<Content Include="Markup\Base\Sounds.mcml" />
<Content Include="Images\ApplicationInactive.png" />
<Content Include="Images\Button\ButtonDisabled.png" />
View
18 TestMediaBrowser/LICENSE.txt
@@ -0,0 +1,18 @@
+(This license applies to all the unit tests)
+
+Copyright (c) 2005-2009 Sam Saffron
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
View
1 TestMediaBrowser/TestMediaBrowser.csproj
@@ -85,6 +85,7 @@
</ItemGroup>
<ItemGroup>
<None Include="SampleMedia\TV\South Park\Season 1\02.mkv" />
+ <Content Include="LICENSE.txt" />
<Content Include="Movies.txt" />
<Content Include="SampleMedia\Images\image.png" />
<Content Include="SampleMedia\TV\South Park\Season 1\03.mpg" />

0 comments on commit 189385e

Please sign in to comment.
Something went wrong with that request. Please try again.