diff options
| author | Nils Dagsson Moskopp <nils@dieweltistgarnichtso.net> | 2011-06-27 06:56:26 -0700 |
|---|---|---|
| committer | Nils Dagsson Moskopp <nils@dieweltistgarnichtso.net> | 2011-06-27 06:56:26 -0700 |
| commit | f37a3a84fafb91bcfc109fed95aa6d42726f1bf7 (patch) | |
| tree | cde1e5f47f191beb4a9cefcd87872aef53b5fcec /src/guiPasswordChange.h | |
| parent | e261cc9e8fa67c9020fa0a82bd1a7041ecd351a0 (diff) | |
| parent | 13cf5425db613dc0a4323c87a4988bb18fb87aca (diff) | |
| download | minetest-f37a3a84fafb91bcfc109fed95aa6d42726f1bf7.tar.gz minetest-f37a3a84fafb91bcfc109fed95aa6d42726f1bf7.tar.bz2 minetest-f37a3a84fafb91bcfc109fed95aa6d42726f1bf7.zip | |
Merge pull request #13 from Bahamada/upstream_merge
Upstream merge
Diffstat (limited to 'src/guiPasswordChange.h')
| -rw-r--r-- | src/guiPasswordChange.h | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/src/guiPasswordChange.h b/src/guiPasswordChange.h index defac3113..1748baade 100644 --- a/src/guiPasswordChange.h +++ b/src/guiPasswordChange.h @@ -1,21 +1,19 @@ /* -Minetest-c55 +Part of Minetest-c55 Copyright (C) 2010-11 celeron55, Perttu Ahola <celeron55@gmail.com> Copyright (C) 2011 Ciaran Gultnieks <ciaran@ciarang.com> -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 2 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, write to the Free Software Foundation, Inc., -51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +Permission to use, copy, modify, and 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. + +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. */ #ifndef GUIPASSWORDCHANGE_HEADER |