Switched license from BSD 2-Clause to 3-Clause

ggustafsson · Mar 9, 2015 · 07eb7d8 · 07eb7d8
1 parent 1079bff
commit 07eb7d8
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 13 deletions.
diff --git a/README.md b/README.md
@@ -65,19 +65,23 @@ Or if you need to celebrate after a pomodoro session:
 
 License
 -------
-Released under the BSD 2-Clause License.
+Released under the BSD 3-Clause License.
 
-    Copyright (c) 2014, Göran Gustafsson. All rights reserved.
+    Copyright (c) 2015, Göran Gustafsson. 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.
+    1. 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.
+    2. 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.
+
+    3. Neither the name of the copyright holder 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

diff --git a/tim b/tim
@@ -1,16 +1,20 @@
 #!/usr/bin/env zsh
 
-# Copyright (c) 2014, Göran Gustafsson. All rights reserved.
+# Copyright (c) 2015, Göran Gustafsson. 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.
+# 1. 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.
+# 2. 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.
+#
+# 3. Neither the name of the copyright holder 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