about summary refs log tree commit diff homepage
path: root/merge.c
diff options
context:
space:
mode:
authorJune McEnroe <june@causal.agency>2017-09-03 14:57:17 -0400
committerJune McEnroe <june@causal.agency>2017-09-03 14:57:17 -0400
commit58eb1831071734bafbdd6c6d846fb493b17a4961 (patch)
treed93f6f084e090a370ae6ac38e8c3fab0af2885d5 /merge.c
parentRevert "Add client readOnly mode" (diff)
downloadtorus-58eb1831071734bafbdd6c6d846fb493b17a4961.tar.gz
torus-58eb1831071734bafbdd6c6d846fb493b17a4961.zip
Relicense AGPL
I know it's already published under a permissive license in what is
probably its final form, but I want to license it AGPL anyway on
principle following some conversations I had about open source,
corporations and copyleft.
Diffstat (limited to 'merge.c')
-rw-r--r--merge.c21
1 files changed, 11 insertions, 10 deletions
diff --git a/merge.c b/merge.c
index 3390c59..9787b43 100644
--- a/merge.c
+++ b/merge.c
@@ -1,17 +1,18 @@
 /*
  * Copyright (c) 2017, June McEnroe <june@causal.agency>
  *
- * Permission to use, copy, modify, and/or 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.
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
  *
- * 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.
+ * 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <curses.h>