From bd6b75cc17627c2e9208eb33c0dd8a9990213494 Mon Sep 17 00:00:00 2001
From: Werner Koch <wk@gnupg.org>
Date: Tue, 3 Nov 2009 19:54:06 +0000
Subject: Resolved changelog conflict

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

diff --git a/ChangeLog b/ChangeLog
index d658fea..5fd1ace 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,10 @@
 
 	* src/gpg-error.h.in (GPG_ERR_SOURCE_DIM): Reduce to 128.
 
+2009-09-29  Werner Koch  <wk@g10code.com>
+
+	* src/err-codes.h.in (GPG_ERR_NO_ENGINE): New.
+
 2009-09-21  Werner Koch  <wk@g10code.com>
 
 	* src/err-sources.h.in (GPG_ERR_SOURCE_G13): New.
-- 
cgit v1.2.3