Merge branch 'master' into Mac

Conflicts not committed
	dogecoin-qt.pro
	src/makefile.osx

contrib/macdeploy/fancy.plist

@@ -22,7 +22,7 @@
 			<integer>370</integer>
 			<integer>156</integer>
 		</array>
-		<key>Dogecoin-Qt.app</key>
+		<key>Litecoin-Qt.app</key>
 		<array>
 			<integer>128</integer>
 			<integer>156</integer>

contrib/macdeploy/macdeployqtplus

@@ -763,7 +763,7 @@ if config.dmg is not None:
                 items_positions.append(itemscript.substitute(params))
 
         params = {
-            "disk" : "Dogecoin-Qt",
+            "disk" : "Litecoin-Qt",
             "window_bounds" : "300,300,800,620",
             "icon_size" : "96",
             "background_commands" : "",

share/qt/Info.plist

@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
+<!DOCTYPE plist SYSTEM "file://localhost/System/Library/DTDs/PropertyList.dtd">
+<plist version="0.9">
 <dict>
 	<key>CFBundleIconFile</key>
 	<string>litecoin.icns</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleGetInfoString</key>
-	<string>$VERSION, Copyright © 2009-$YEAR The Dogecoin developers</string>
+	<string>$VERSION, Copyright © 2009-$YEAR The Bitcoin developers</string>
 	<key>CFBundleShortVersionString</key>
 	<string>$VERSION</string>
 	<key>CFBundleVersion</key>
@@ -15,22 +15,22 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleExecutable</key>
-	<string>Dogecoin-Qt</string>
+	<string>Litecoin-Qt</string>
 	<key>CFBundleIdentifier</key>
-	<string>org.dogecoin.wallet-qt</string>
-	<key>CFBundleURLTypes</key>
-	<array>
-		<dict>
-			<key>CFBundleTypeRole</key>
-			<string>Editor</string>
-			<key>CFBundleURLName</key>
-			<string>org.litecoin.LitecoinPayment</string>
-			<key>CFBundleURLSchemes</key>
-			<array>
-				<string>litecoin</string>
-			</array>
-		</dict>
-	</array>
+	<string>org.litecoin.Litecoin-Qt</string>
+        <key>CFBundleURLTypes</key>
+        <array>
+          <dict>
+            <key>CFBundleTypeRole</key>
+            <string>Editor</string>
+            <key>CFBundleURLName</key>
+            <string>org.litecoin.LitecoinPayment</string>
+            <key>CFBundleURLSchemes</key>
+            <array>
+              <string>litecoin</string>
+            </array>
+          </dict>
+        </array>
 	<key>NSHighResolutionCapable</key>
 	<true/>
 </dict>

src/compat.h

@@ -28,10 +28,6 @@
 #endif
 
 typedef u_int SOCKET;
-#ifdef MAC_OSX
-#define MSG_NOSIGNAL        SO_NOSIGPIPE
-#endif
-
 #ifdef WIN32
 #define MSG_NOSIGNAL        0
 #define MSG_DONTWAIT        0