summaryrefslogtreecommitdiffstats
path: root/src/include/openssl/mem.h
diff options
context:
space:
mode:
authorAdam Langley <agl@google.com>2015-09-24 22:57:25 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-09-24 22:57:25 +0000
commit3781a60670f92c3c6fca860cb4589495cefa2e56 (patch)
treedd743d9d64af3145fe96b8d5fc2f3427544794bd /src/include/openssl/mem.h
parent4ca36931e543512682d75e8e6d923144261dfd4d (diff)
parent1e4884f615b20946411a74e41eb9c6aa65e2d5f3 (diff)
downloadexternal_boringssl-3781a60670f92c3c6fca860cb4589495cefa2e56.tar.gz
external_boringssl-3781a60670f92c3c6fca860cb4589495cefa2e56.tar.bz2
external_boringssl-3781a60670f92c3c6fca860cb4589495cefa2e56.zip
am 1e4884f6: external/boringssl: sync with upstream.
* commit '1e4884f615b20946411a74e41eb9c6aa65e2d5f3': external/boringssl: sync with upstream.
Diffstat (limited to 'src/include/openssl/mem.h')
-rw-r--r--src/include/openssl/mem.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/include/openssl/mem.h b/src/include/openssl/mem.h
index 42ec46a..c8e2b3e 100644
--- a/src/include/openssl/mem.h
+++ b/src/include/openssl/mem.h
@@ -1,4 +1,5 @@
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved.
+/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
+ * All rights reserved.
*
* This package is an SSL implementation written
* by Eric Young (eay@cryptsoft.com).