diff options
| author | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2011-02-01 21:12:41 +0100 |
|---|---|---|
| committer | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2011-02-01 21:12:41 +0100 |
| commit | 852de0424f7226dfd61d2779c1ea6413ac85d584 (patch) | |
| tree | e902d1e91d760273cb1b1fba4c51cf3232ed6194 /src/utils | |
| parent | f19b3786f3f000a84c8080594e398686e0298ca4 (diff) | |
| parent | bcd1d9aff41b5c152cafade7532242c94ac1f710 (diff) | |
| download | mana-client-852de0424f7226dfd61d2779c1ea6413ac85d584.tar.gz mana-client-852de0424f7226dfd61d2779c1ea6413ac85d584.tar.bz2 mana-client-852de0424f7226dfd61d2779c1ea6413ac85d584.tar.xz mana-client-852de0424f7226dfd61d2779c1ea6413ac85d584.zip | |
Merge branch '0.5'
Conflicts:
po/de.po
src/game.cpp
src/resources/wallpaper.cpp
Diffstat (limited to 'src/utils')
| -rw-r--r-- | src/utils/sha256.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/utils/sha256.cpp b/src/utils/sha256.cpp index 57809c8b..9175352f 100644 --- a/src/utils/sha256.cpp +++ b/src/utils/sha256.cpp @@ -6,9 +6,8 @@ * This file has been slighly modified as part of The Mana Client. * * 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 - * any later version. + * it under the terms of the GNU General Public License version 2, as + * published by the Free Software Foundation. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of |