Permalink
Browse files

New LICENSE file thanks to Justyn and Joseph

  • Loading branch information...
1 parent bd4f79e commit 5fc394c9e5841140e88c1afedea481b7c70c66fe @dreeves committed Dec 19, 2012
Showing with 32 additions and 7 deletions.
  1. +32 −7 LICENSE
View
@@ -1,10 +1,35 @@
-You are free to do anything at all with this code.
-Specifically, the license is this:
-http://www.apache.org/licenses/LICENSE-2.0.html
-
-Thanks to Justyn Butler!
+Thanks to Justyn Butler and Joseph Cloutier for all the help with this!
Ask us -- support@beeminder.com -- if you need any clarifications.
Our only goal is to spread TagTime as widely as possible.
-We may want to incorporate TagTime into Beeminder (more directly than we've currently
-done) but the code and ideas are hereby firmly in the public domain!
+We may want to incorporate TagTime into Beeminder (more directly than we've
+currently done) but TagTime is free software: you can redistribute it and/or
+modify it.
+
+Full legalese follows.
+
+Copyright (c) 2012, Daniel Reeves and Bethany Soule
+All rights reserved.
+
+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 <organization> 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 <COPYRIGHT HOLDER> 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.
+

0 comments on commit 5fc394c

Please sign in to comment.