branch: elpa/gruvbox-theme commit 42c46d8b521ab1311bba3efb4faaefe255bd7a56 Author: Greduan <eduanlava...@gmail.com> Commit: Greduan <eduanlava...@gmail.com>
Fixed license issues caused by my ignorance --- README.md | 37 +++++++++++++++++++++++++++++++++++-- gruvbox-theme.el | 15 +-------------- mit-license.txt | 20 ++++++++++++++++++++ 3 files changed, 56 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index 02ce9a4863..5526c04adc 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,8 @@ # Gruvbox theme for Emacs -A theme for Emacs based on the Gruvbox theme for Vim +Gruvbox is a retro groove color scheme for Emacs. This is a port of the Vim +version originally by [Pavel Pertsev](https://github.com/morhetz) found +[here](https://github.com/morhetz/gruvbox). ## Usage @@ -20,8 +22,39 @@ FIXME ## License +Dual licensed under the MIT and GPLv3 licenses. + + +### MIT + +``` +The MIT License (MIT) + +Copyright (c) 2013 Lee Machin + +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. +``` + + +### GPLv3 + ``` -DocPad App is an experimental app to control DocPad through a GUI. +Gruvbox is a retro groove color scheme for Emacs. Port of the Vim version. Copyright (C) 2013 Eduán Lávaque This program is free software: you can redistribute it and/or modify diff --git a/gruvbox-theme.el b/gruvbox-theme.el index 86b83c7bf8..e4559ca72f 100644 --- a/gruvbox-theme.el +++ b/gruvbox-theme.el @@ -1,24 +1,11 @@ ;;; gruvbox-theme.el --- A retro-groove colour theme for Emacs -;; Copyright (C) 2013 Eduán Lávaque +;; Copyright (C) 2013 Eduán Lávaque, Lee Machin ;; Author: Eduán Lávaque <eduanlava...@gmail.com> ;; URL: http://github.com/Greduan/emacs-theme-gruvbox ;; Version: 0.1 -;; This program is free software; you can redistribute it and/or modify -;; it under the terms of the GNU General Public License as published by -;; the Free Software Foundation, either version 3 of the License, or -;; (at your option) any later version. - -;; 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 General Public License for more details. - -;; You should have received a copy of the GNU General Public License -;; along with this program. If not, see <http://www.gnu.org/licenses/>. - ;;; Commentary: ;; A port of the Gruvbox colorscheme for Vim, built on top of the new diff --git a/mit-license.txt b/mit-license.txt new file mode 100644 index 0000000000..81ed4113d2 --- /dev/null +++ b/mit-license.txt @@ -0,0 +1,20 @@ +The MIT License (MIT) + +Copyright (c) 2013 Lee Machin + +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.