[svn] gpg-error - r225 - trunk

[svn author wk]

Author: wk
Date: 2009-11-03 20:54:06 +0100 (Tue, 03 Nov 2009)
New Revision: 225

Modified:
   trunk/ChangeLog
Log:
Resolved changelog conflict


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2009-10-26 16:45:05 UTC (rev 224)
+++ trunk/ChangeLog	2009-11-03 19:54:06 UTC (rev 225)
@@ -2,6 +2,10 @@
 
 	* src/gpg-error.h.in (GPG_ERR_SOURCE_DIM): Reduce to 128.
 
+2009-09-29  Werner Koch  <wk at g10code.com>
+
+	* src/err-codes.h.in (GPG_ERR_NO_ENGINE): New.
+
 2009-09-21  Werner Koch  <wk at g10code.com>
 
 	* src/err-sources.h.in (GPG_ERR_SOURCE_G13): New.