summaryrefslogtreecommitdiff
path: root/pngmem.c
diff options
context:
space:
mode:
authorHaibo Huang <hhb@google.com>2019-06-10 11:41:54 -0700
committerHaibo Huang <hhb@google.com>2019-06-10 14:38:44 -0700
commit4f55151a4b8cbda0ea61646f437fdf57c54190d9 (patch)
tree478f3db238be7e08885ac80ac8ef1be9935441bb /pngmem.c
parent9ef33ccf9b2e957c1f5e228dbab15fbda1744300 (diff)
parenta40189cf881e9f0db80511c382292a5604c3c3d1 (diff)
Merge tag 'v1.6.37' into HEAD
Test: build Bug: 134761359 Change-Id: Iee93c2907d93430a8de681f2e987d37f4b3b17bc
Diffstat (limited to 'pngmem.c')
-rw-r--r--pngmem.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/pngmem.c b/pngmem.c
index ff3ef7e88..09ed9c1c9 100644
--- a/pngmem.c
+++ b/pngmem.c
@@ -1,10 +1,10 @@
/* pngmem.c - stub functions for memory allocation
*
- * Last changed in libpng 1.6.26 [October 20, 2016]
+ * Copyright (c) 2018 Cosmin Truta
* Copyright (c) 1998-2002,2004,2006-2014,2016 Glenn Randers-Pehrson
- * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
- * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
+ * Copyright (c) 1996-1997 Andreas Dilger
+ * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
*
* This code is released under the libpng license.
* For conditions of distribution and use, see the disclaimer