Merge tag 'upstream/4.0.15'

Upstream version 4.0.15

1 files changed, 12 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 016afdc..38c707f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2012-03-23  Till Kamppeter <till.kamppeter@gmail.com>
+
+	* Tagged branch for release 4.0.15.
+
+	* VERSION, README, USAGE, configure.ac: Updated for release 4.0.15.
+
+	* options.c: Improved check whether a driver works with PDF input data:
+	  Do not take into account bogus options which appear due to bugs in
+	  PPD files (type is TYPE_NONE) or composite options and in addition
+	  add debug output to show the reason for the decision to convert to
+	  PostScript (Ubuntu bugs #953962 and #960989).
+
 2012-03-14  Till Kamppeter <till.kamppeter@gmail.com>
 
 	* Tagged branch for release 4.0.14.