diff options
| author | dcommander <dcommander@632fc199-4ca6-4c93-a231-07263d6284db> | 2013-01-01 10:56:38 +0000 |
|---|---|---|
| committer | dcommander <dcommander@632fc199-4ca6-4c93-a231-07263d6284db> | 2013-01-01 10:56:38 +0000 |
| commit | 988db2298c43633d2ba1159a6307ac86d7e7701d (patch) | |
| tree | 765cbd0a2120d1dbebf30c54299c032e53f08c6a /jversion.h | |
| parent | 01e080208e6e850a8ad2582ad6e01b6f5dd0e22b (diff) | |
Merge some of the README changes from jpeg-8d and change the copyright and version strings to reflect that we use some of that code.
git-svn-id: svn://svn.code.sf.net/p/libjpeg-turbo/code/trunk@886 632fc199-4ca6-4c93-a231-07263d6284db
Diffstat (limited to 'jversion.h')
| -rw-r--r-- | jversion.h | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -2,7 +2,7 @@ * jversion.h * * This file was part of the Independent JPEG Group's software: - * Copyright (C) 1991-2010, Thomas G. Lane, Guido Vollbeding. + * Copyright (C) 1991-2012, Thomas G. Lane, Guido Vollbeding. * Modifications: * Copyright (C) 2010, 2012, D. R. Commander. * For conditions of distribution and use, see the accompanying README file. @@ -13,7 +13,7 @@ #if JPEG_LIB_VERSION >= 80 -#define JVERSION "8b 16-May-2010" +#define JVERSION "8d 15-Jan-2012" #elif JPEG_LIB_VERSION >= 70 @@ -25,7 +25,7 @@ #endif -#define JCOPYRIGHT "Copyright (C) 1991-2010 Thomas G. Lane, Guido Vollbeding\n" \ +#define JCOPYRIGHT "Copyright (C) 1991-2012 Thomas G. Lane, Guido Vollbeding\n" \ "Copyright (C) 1999-2006 MIYASAKA Masaru\n" \ "Copyright (C) 2009 Pierre Ossman for Cendio AB\n" \ "Copyright (C) 2009-2012 D. R. Commander\n" \ |