gitea-mirror/git-crypt
1
0
Fork 0
mirror of https://github.com/AGWA/git-crypt.git synced 2025-12-05 20:40:05 -08:00
Code Issues Packages Projects Releases Wiki Activity

Re-license parse_options under X11 license

Browse Source
This commit is contained in:
Andrew Ayer
2015-05-17 14:38:12 -07:00
parent c279a6a20a
commit 3db6271492
2 changed files with 38 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
parse_options.cpp
View File

@@ -1,31 +1,28 @@
/* /*
* Copyright 2014 Andrew Ayer * Copyright 2014 Andrew Ayer
* *
* This file is part of git-crypt. * 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:
* *
* git-crypt is free software: you can redistribute it and/or modify * The above copyright notice and this permission notice shall be included
* it under the terms of the GNU General Public License as published by * in all copies or substantial portions of the Software.
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* *
* git-crypt is distributed in the hope that it will be useful, * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* but WITHOUT ANY WARRANTY; without even the implied warranty of * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
* GNU General Public License for more details. * 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.
* *
* You should have received a copy of the GNU General Public License * Except as contained in this notice, the name(s) of the above copyright
* along with git-crypt. If not, see <http://www.gnu.org/licenses/>. * holders shall not be used in advertising or otherwise to promote the
* * sale, use or other dealings in this Software without prior written
* Additional permission under GNU GPL version 3 section 7: * authorization.
*
* If you modify the Program, or any covered work, by linking or
* combining it with the OpenSSL project's OpenSSL library (or a
* modified version of that library), containing parts covered by the
* terms of the OpenSSL or SSLeay licenses, the licensors of the Program
* grant you additional permission to convey the resulting work.
* Corresponding Source for a non-source form of such a combination
* shall include the source code for the parts of OpenSSL used as well
* as that of the covered work.
*/ */
#include "parse_options.hpp" #include "parse_options.hpp"

41
parse_options.hpp
View File

@@ -1,31 +1,28 @@
/* /*
* Copyright 2014 Andrew Ayer * Copyright 2014 Andrew Ayer
* *
* This file is part of git-crypt. * 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:
* *
* git-crypt is free software: you can redistribute it and/or modify * The above copyright notice and this permission notice shall be included
* it under the terms of the GNU General Public License as published by * in all copies or substantial portions of the Software.
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* *
* git-crypt is distributed in the hope that it will be useful, * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* but WITHOUT ANY WARRANTY; without even the implied warranty of * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
* GNU General Public License for more details. * 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.
* *
* You should have received a copy of the GNU General Public License * Except as contained in this notice, the name(s) of the above copyright
* along with git-crypt. If not, see <http://www.gnu.org/licenses/>. * holders shall not be used in advertising or otherwise to promote the
* * sale, use or other dealings in this Software without prior written
* Additional permission under GNU GPL version 3 section 7: * authorization.
*
* If you modify the Program, or any covered work, by linking or
* combining it with the OpenSSL project's OpenSSL library (or a
* modified version of that library), containing parts covered by the
* terms of the OpenSSL or SSLeay licenses, the licensors of the Program
* grant you additional permission to convey the resulting work.
* Corresponding Source for a non-source form of such a combination
* shall include the source code for the parts of OpenSSL used as well
* as that of the covered work.
*/ */
#ifndef PARSE_OPTIONS_HPP #ifndef PARSE_OPTIONS_HPP