From: Luke Dashjr <luke-jr+git@utopios.org>
Date: Fri, 16 Mar 2012 21:28:22 +0000 (-0400)
Subject: Merge branch '0.5.0.x' into 0.5.3.x
X-Git-Tag: v0.4.0-unstable~129^2~1^2~18^2~10^2~12^2~2
X-Git-Url: https://git.novaco.in/?a=commitdiff_plain;h=c1c86b147b50ae470eef91e3cf874e33f54bdfea;hp=-c;p=novacoin.git

Merge branch '0.5.0.x' into 0.5.3.x
---

c1c86b147b50ae470eef91e3cf874e33f54bdfea
diff --combined bitcoin-qt.pro
index 34ce109,7fcb507..121a53f
--- a/bitcoin-qt.pro
+++ b/bitcoin-qt.pro
@@@ -1,6 -1,6 +1,6 @@@
  TEMPLATE = app
  TARGET =
 -VERSION = 0.5.0.4
 +VERSION = 0.5.3
  INCLUDEPATH += src src/json src/qt
  DEFINES += QT_GUI BOOST_THREAD_USE_LIB
  CONFIG += no_include_pwd
@@@ -251,8 -251,8 +251,8 @@@ isEmpty(BOOST_INCLUDE_PATH) 
      macx:BOOST_INCLUDE_PATH = /opt/local/include
  }
  
- windows:LIBS += -lws2_32
- windows:DEFINES += WIN32
+ windows:LIBS += -lmingwthrd -lws2_32
+ windows:DEFINES += _MT WIN32
  windows:RC_FILE = src/qt/res/bitcoin-qt.rc
  
  macx:HEADERS += src/qt/macdockiconhandler.h