pidgin/quail/quail-redux

Fix merge conflict, part2

2013-09-20, Phil Hannent
a985a548a72f
Parents a355ffbd00cb
Children 4d501b99d544
Fix merge conflict, part2
1 files changed, 1 insertions(+), 1 deletions(-)
  • +1 -1
    src/main.cpp
    • --- a/src/main.cpp Fri Sep 20 13:37:45 2013 +0100
    +++ b/src/main.cpp Fri Sep 20 13:46:58 2013 +0100
    @@ -22,7 +22,7 @@
    #include <QApplication>
    #include <QDebug>
    -#if defined(Q_OS_WIN)
    +#if defined(Q_OS_CYGWIN)
    #include "QuailWinGlibEventLoop.h"
    #endif
    #include "QuailEventLoop.h"