summaryrefslogtreecommitdiff
path: root/extra/yassl/taocrypt/include/error.hpp
diff options
context:
space:
mode:
authorVicențiu Ciorbaru <vicentiu@mariadb.org>2019-05-11 22:19:05 +0300
committerVicențiu Ciorbaru <vicentiu@mariadb.org>2019-05-11 22:19:05 +0300
commitcb248f880619431850e5638009a6098048050edf (patch)
tree32858b1936d56c8391abf003fbdf6a9d6ba9a5e9 /extra/yassl/taocrypt/include/error.hpp
parentc0ac0b886047496e105a566a063bf1bd932d00a4 (diff)
parent5543b75550962f07b4adcd47a6e52accec0a7d0f (diff)
downloadmariadb-git-cb248f880619431850e5638009a6098048050edf.tar.gz
Merge branch '5.5' into 10.1
Diffstat (limited to 'extra/yassl/taocrypt/include/error.hpp')
-rw-r--r--extra/yassl/taocrypt/include/error.hpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/extra/yassl/taocrypt/include/error.hpp b/extra/yassl/taocrypt/include/error.hpp
index 49bc62e6e8d..a749c00d80d 100644
--- a/extra/yassl/taocrypt/include/error.hpp
+++ b/extra/yassl/taocrypt/include/error.hpp
@@ -14,7 +14,7 @@
You should have received a copy of the GNU General Public License
along with this program; see the file COPYING. If not, write to the
Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
- MA 02110-1301 USA.
+ MA 02110-1335 USA.
*/
/* error.hpp provides a taocrypt error numbers