From 05d24d304f304d4ccaab9032dce2829e215ae138 Mon Sep 17 00:00:00 2001
From: Frank Warmerdam <warmerdam@pobox.com>
Date: Thu, 13 Dec 2001 02:04:33 +0000
Subject: [PATCH] *** empty log message ***

---
 ChangeLog | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 814a2aca..404aad8d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2001-12-12  Frank Warmerdam  <warmerdam@pobox.com>
+
+	* libtiff/tif_jpeg.c: allow jpeg data stream sampling values to 
+	override those from tiff directory.  This makes this work with 
+	ImageGear generated files. 
+
 2001-12-07  Frank Warmerdam  <warmerdam@pobox.com>
 
 	* html/Makefile.in: added missing images per bug 92.