Merge remote-tracking branch 'origin/master'

This commit is contained in:
doitux
2012-11-24 22:36:36 +01:00
2 changed files with 4 additions and 2 deletions
+2 -1
View File
@@ -391,7 +391,8 @@ win32 {
-lmswsock \ -lmswsock \
-lws2_32 \ -lws2_32 \
-ladvapi32 \ -ladvapi32 \
-lwldap32 -lwldap32 \
-lcrypt32
RC_FILE = pokerth.rc RC_FILE = pokerth.rc
} }
unix:!mac { unix:!mac {
+2 -1
View File
@@ -157,7 +157,8 @@ win32 {
-lmswsock \ -lmswsock \
-lws2_32 \ -lws2_32 \
-ladvapi32 \ -ladvapi32 \
-lwldap32 -lwldap32 \
-lcrypt32
} }
!win32 { !win32 {