Permalink
Browse files

re-license under Apache 2.0

  • Loading branch information...
1 parent 192b58b commit 72e462243d9a7ac33453480ebcce65cbe98f2e88 @jweiss jweiss committed Nov 21, 2011
Showing with 17 additions and 17 deletions.
  1. +2 −0 CHANGELOG.md
  2. +13 −15 LICENSE.txt
  3. +2 −2 README.md
View
@@ -1,6 +1,8 @@
Changelog
=============
+- re-license under Apache 2.0
+
0.7.0
- Compatible with Rails 3.1 --> Requires ActiveModel and ActiveSupport 3.1
View
@@ -1,15 +1,13 @@
-/*
- * Copyright (c) 2010 Peritor GmbH <info@peritor.com>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
+Copyright 2010-2011 Peritor GmbH
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
View
@@ -329,11 +329,11 @@ If auto_conflict_resolution_on_save is enabled, something like this will work:
License
=============
-SimplyStored is licensed under the OpenBSD / two-clause BSD license, modeled after the ISC license. See LICENSE.txt
+SimplyStored is licensed under the Apache 2.0 license. See LICENSE.txt
About
=============
SimplyStored was written by [Mathias Meyer](http://twitter.com/roidrage) and [Jonathan Weiss](http://twitter.com/jweiss) for [Peritor](http://www.peritor.com).
-
+

0 comments on commit 72e4622

Please sign in to comment.