Permalink
Browse files

Added Licences for Caliburn Micro and Extended WPF Toolkit

  • Loading branch information...
1 parent 980e314 commit 80c848407bc0632fa1f10a301003bbdd7a8e26a0 @dwarry committed Oct 11, 2012
Showing with 111 additions and 10 deletions.
  1. +21 −0 LICENCE.CaliburnMicro
  2. +59 −0 LICENCE.WpfToolkit
  3. +22 −4 LICENSE
  4. +9 −6 Readme.markdown
View
@@ -0,0 +1,21 @@
+The MIT License (MIT)
+Copyright (c) 2010 Blue Spire Consulting, Inc.
+
+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 above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+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
@@ -0,0 +1,59 @@
+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.
View
26 LICENSE
@@ -1,9 +1,27 @@
+BSD Two Clause Licence
+
Copyright (c) 2012, David Warry
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.
+
-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.
-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 HOLDER 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 HOLDER 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.
View
@@ -39,12 +39,15 @@ if you need more control.
[Stijn Janmaat](http://thenounproject.com/stijnjanmaat). The SVG icons were converted to
XAML by [Inkscape](http://inkscape.org).
- * Caliburn.Micro
+ * [Caliburn.Micro](http://caliburnmicro.codeplex.com)
+
+ Caliburn.Micro is a great Model-View-ViewModel application
+ framework which greatly simplifies data binding and commanding through an extensible
+ set of conventions. Licensed under the [MIT licence](http://caliburnmicro.codeplex.com/license).
- [Caliburn.Micro](http://caliburnmicro.codeplex.com) is a great Model-View-ViewModel application
- framework
+ * [Extended WPF Toolkit](http://wpftoolkit.codeplex.com/)
- * Extended WPF Toolkit
+ Various controls from the Extended WPF Toolkit were used,
+ including the BusyIndicator, WatermarkTextBox and the Zoombox.
+ Licenced under the [MS Public License](http://wpftoolkit.codeplex.com/license).
- Various controls from the [Extended WPF Toolkit](http://wpftoolkit.codeplex.com/) were used,
- including the BusyIndicator, WatermarkTextBox and the Zoombox.

0 comments on commit 80c8484

Please sign in to comment.