diff options
| author | Fabian Greffrath | 2015-05-27 19:35:29 +0200 |
|---|---|---|
| committer | Fabian Greffrath | 2015-05-27 19:35:29 +0200 |
| commit | 310ad72c180f321c8069f9b3908069537e62d3a1 (patch) | |
| tree | 7ad7c56d442c836885acd45858c2231a7bcaa99a | |
| parent | 7d8a9f3f2ecea118993fc5c828bdf4f0e4c2f154 (diff) | |
| parent | 4ffeb43fb33f5899f1aaf2b4bae484d2a3d71211 (diff) | |
| download | chocolate-doom-310ad72c180f321c8069f9b3908069537e62d3a1.tar.gz chocolate-doom-310ad72c180f321c8069f9b3908069537e62d3a1.tar.bz2 chocolate-doom-310ad72c180f321c8069f9b3908069537e62d3a1.zip | |
Merge branch 'master' of https://github.com/chocolate-doom/chocolate-doom
| -rw-r--r-- | src/sha1.c | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -7,7 +7,7 @@ * * GnuPG 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 + * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * * GnuPG is distributed in the hope that it will be useful, @@ -16,7 +16,9 @@ * 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/>. + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, + * USA. */ |