Merge commit '3e21d041efb95b6358c749e021bf5ddbcc05bcd7'

* commit '3e21d041efb95b6358c749e021bf5ddbcc05bcd7':
  Info.plist: Make GitX open any file/folder on drop
  diffHighlighter: Correctly match unified diff hunks
  diffHighlighter: Fix indent-after-stagebutton bug

Info.plist

@@ -8,6 +8,16 @@
 	<string>${PRODUCT_NAME}</string>
 	<key>CFBundleDocumentTypes</key>
 	<array>
+		<dict>
+			<key>CFBundleTypeExtensions</key>
+			<array>
+				<string>*</string>
+			</array>
+			<key>CFBundleTypeRole</key>
+			<string>None</string>
+			<key>CFBundleTypeName</key>
+			<string>Standard folder</string>
+		</dict>
 		<dict>
 			<key>CFBundleTypeExtensions</key>
 			<array>

html/lib/diffHighlighter.js

@@ -203,7 +203,7 @@ var highlightDiff = function(diff, element, callbacks) {
 				header = false;
 			}
 
-			if (m = l.match(/@@ \-([0-9]+),\d+ \+(\d+),\d+ @@/))
+			if (m = l.match(/@@ \-([0-9]+),?\d* \+(\d+),?\d* @@/))
 			{
 				hunk_start_line_1 = parseInt(m[1]) - 1;
 				hunk_start_line_2 = parseInt(m[2]) - 1;
@@ -214,7 +214,7 @@ var highlightDiff = function(diff, element, callbacks) {
 		} else if (firstChar == " ") {
 			line1 += ++hunk_start_line_1 + "\n";
 			line2 += ++hunk_start_line_2 + "\n";
-			diffContent += l + "\n";
+			diffContent += "<div class='noopline'>" + l + "</div>";
 		}
 	}
 

html/views/commit/commit.css

@@ -61,7 +61,6 @@ table.diff {
 }
 
 .diff a.stagebutton {
-	display: block;
 	width: 40px;
 	padding: 0 2px 0 2px;
 	margin-bottom: 4px;
@@ -77,7 +76,6 @@ table.diff {
 	text-align: center;
 
 	-webkit-border-radius: 2px;
-	float: left;
 }
 
 #multiselect {
@@ -94,4 +92,4 @@ table.diff {
 	border: 5px solid #EEE;
 	margin: -5px;
 	padding-left: 20px;
-}
+}