From 2a20de1d09cf3e6ffadbbe71d02d155c909e9664 Mon Sep 17 00:00:00 2001
From: Abel Deuring <a.deuring@satzbau-gmbh.de>
Date: Tue, 21 Nov 2000 16:30:50 +0000
Subject: [PATCH] Sharp backend: Support for model  JX320 added

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

diff --git a/ChangeLog b/ChangeLog
index a2b1a9e1a..f68273319 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2000-11-21 Abel Deuring <a.deuring@satzbau-gmbh.de>
+	* backend/sharp.c, backend/sharp.desc, doc/sharp.man: Support
+	  for JX320 added	
+
 2000-11-21  Henning Meier-Geinitz <hmg@gmx.de>
 
 	* AUTHORS: Added FUKUDA Kazuya for the nec Backend. Used spaces instead 
@@ -47,6 +51,7 @@
 	  SANE interface for user authorization using MD5 digest
 	* lib/Makefile.in sanei/Makefile.in: updated Makefiles
 
+>>>>>>> 1.53
 2000-11-19  Karl Heinz Kremer <khk@khk.net>
 
 	* backend/epson.c: Removed one debug output statement.