summaryrefslogtreecommitdiff
path: root/src/utils/sha256.cpp
diff options
context:
space:
mode:
authorDavid Athay <dathay@mini1.local>2011-04-06 19:24:23 -0500
committerDavid Athay <dathay@mini1.local>2011-04-06 19:24:23 -0500
commit701a8d8bf4fe2d286c2ffa39efa8b80e6c85ff01 (patch)
tree4f01225b6a3958ce9361fe60533a19d6d522ed48 /src/utils/sha256.cpp
parent66bd56ebec2bff48fb1484603b41643fd89bf4d6 (diff)
parentb6f3db30c595d8e89572c78eb82b9823b8491c54 (diff)
downloadmana-701a8d8bf4fe2d286c2ffa39efa8b80e6c85ff01.tar.gz
mana-701a8d8bf4fe2d286c2ffa39efa8b80e6c85ff01.tar.bz2
mana-701a8d8bf4fe2d286c2ffa39efa8b80e6c85ff01.tar.xz
mana-701a8d8bf4fe2d286c2ffa39efa8b80e6c85ff01.zip
Merge branch '0.5' of git://gitorious.org/mana/mana into 0.5
Diffstat (limited to 'src/utils/sha256.cpp')
-rw-r--r--src/utils/sha256.cpp5
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