Changeset 846 for trunk/src/3rdparty/libjpeg/jversion.h

Timestamp:

May 5, 2011, 5:36:53 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/3rdparty/libjpeg/jversion.h (modified) (2 diffs)

trunk/src/3rdparty/libjpeg/jversion.h

@@ -2 +2 @@
  * jversion.h
  *
- * Copyright (C) 1991-1998, Thomas G. Lane.
+ * Copyright (C) 1991-2010, Thomas G. Lane, Guido Vollbeding.
  * This file is part of the Independent JPEG Group's software.
  * For conditions of distribution and use, see the accompanying README file.
@@ -10 +10 @@
 
 
-#define JVERSION        "6b  27-Mar-1998"
+#define JVERSION        "8  10-Jan-2010"
 
-#define JCOPYRIGHT      "Copyright (C) 1998, Thomas G. Lane"
+#define JCOPYRIGHT      "Copyright (C) 2010, Thomas G. Lane, Guido Vollbeding"