Merge branch 'master' of ssh://playfair.gnupg.org/git/pinentry-qt
authorWerner Koch <wk@gnupg.org>
Tue, 22 Jun 2010 11:14:54 +0000 (13:14 +0200)
committerWerner Koch <wk@gnupg.org>
Tue, 22 Jun 2010 11:14:54 +0000 (13:14 +0200)
Conflicts:
ChangeLog

1  2 
ChangeLog

diff --cc ChangeLog
+++ b/ChangeLog
@@@ -1,7 -1,7 +1,11 @@@
 +2010-06-22  Werner Koch  <wk@g10code.com>
 +
 +      * pinentry.c (pinentry_loop): Pass the correct fd.
 +
+ 2010-06-21  Andre Heinecke <aheinecke@intevation.de>
+       * main.cpp [W32CE]: Include winbase.h
  2010-06-21  Werner Koch  <wk@g10code.com>
  
        * pinentrydialog.cpp: Use #if and not #ifdef along with defined.