Merge remote-tracking branch 'origin/master' into develop

SwiftNeoVim/Info.plist

@@ -15,11 +15,11 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.11.0-SNAPSHOT-20161109.2136</string>
+	<string>0.10.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>121</string>
+	<string>122</string>
 	<key>NSHumanReadableCopyright</key>
 	<string>Copyright © 2016 Tae Won Ha. All rights reserved.</string>
 	<key>NSPrincipalClass</key>

SwiftNeoVimTests/Info.plist

@@ -15,10 +15,10 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.11.0-SNAPSHOT-20161109.2136</string>
+	<string>0.10.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>121</string>
+	<string>122</string>
 </dict>
 </plist>

VimR-Workspace-Demo/Info.plist

@@ -17,11 +17,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.11.0-SNAPSHOT-20161109.2136</string>
+	<string>0.10.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>121</string>
+	<string>122</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
 	<key>NSHumanReadableCopyright</key>

VimR.xcodeproj/project.pbxproj

@@ -1202,7 +1202,7 @@
 				COMBINE_HIDPI_IMAGES = YES;
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 121;
+				DYLIB_CURRENT_VERSION = 122;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -1226,7 +1226,7 @@
 				COMBINE_HIDPI_IMAGES = YES;
 				DEFINES_MODULE = YES;
 				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 121;
+				DYLIB_CURRENT_VERSION = 122;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -1375,7 +1375,7 @@
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 121;
+				CURRENT_PROJECT_VERSION = 122;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
@@ -1425,7 +1425,7 @@
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 121;
+				CURRENT_PROJECT_VERSION = 122;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;

VimR/Info.plist

@@ -36,7 +36,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.11.0-SNAPSHOT-20161109.2136</string>
+	<string>0.10.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -53,7 +53,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>121</string>
+	<string>122</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
 	<key>NSHumanReadableCopyright</key>

VimRTests/Info.plist

@@ -15,10 +15,10 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.11.0-SNAPSHOT-20161109.2136</string>
+	<string>0.10.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>121</string>
+	<string>122</string>
 </dict>
 </plist>

appcast.xml

@@ -7,30 +7,29 @@
     <description>Most recent changes with links to updates for VimR.</description>
     <language>en</language>
     <item>
-      <title>v0.10.0-118</title>
+      <title>v0.10.1-122</title>
       <description><![CDATA[
     <ul>
-<li>GH-309: When opening a file via a GUI action, check whether the file is already open.<ul>
+<li>GH-321: <code>Cmd-V</code> now works in the terminal mode.</li>
-<li>Open in a tab or split: select the tab/split</li>
+<li>GH-330: Closing the file browser with <code>Cmd-1</code> now focuses the Neovim view.</li>
-<li>Open in another (GUI) window: let NeoVim handle it.</li>
+<li>GU-308: Set <code>cwd</code> to the parent folder of the file when opening a file in a new window</li>
+<li>Update RxSwift from <code>3.0.0-rc1</code> to <code>3.0.1</code></li>
+<li>Update Neovim to neovim/neovim@0213e99aaf6eba303fd459183dd14a4a11cc5b07<ul>
+<li>includes <code>inccommand</code>! 😆</li>
 </ul>
 </li>
-<li>GH-239, GH-312: Turn on font smoothing such that the 'Use LCD font smoothing when available' setting from the General system preferences pane is respected.</li>
-<li>GH-270: Make line spacing configurable via the 'Appearances' preferences pane.</li>
-<li>GH-322: Fix crashes related to the file browser.</li>
-<li>Bugfix: The command line tool <code>vimr</code> sometimes does not open the files in the frontmost window.</li>
 </ul>
   ]]></description>
       <releaseNotesLink>
-        https://github.com/qvacua/vimr/releases/tag/v0.10.0-118
+        https://github.com/qvacua/vimr/releases/tag/v0.10.1-122
       </releaseNotesLink>
-      <pubDate>2016-11-04T22:32:39.114160</pubDate>
+      <pubDate>2016-11-10T15:28:19.011522</pubDate>
-      <minimumSystemVersion>10.11.0</minimumSystemVersion>
+      <minimumSystemVersion>10.10.0</minimumSystemVersion>
-      <enclosure url="https://github.com/qvacua/vimr/releases/download/v0.10.0-118/VimR-v0.10.0-118.tar.bz2"
+      <enclosure url="https://github.com/qvacua/vimr/releases/download/v0.10.1-122/VimR-v0.10.1-122.tar.bz2"
-                 sparkle:version="118"
+                 sparkle:version="122"
-                 sparkle:shortVersionString="0.10.0"
+                 sparkle:shortVersionString="0.10.1"
-                 sparkle:dsaSignature="MC0CFBtKoWkAkHfFgnw811sMOJRINPafAhUAxFmCmw1sfphw5kfjAfjK9JHYsR4="
+                 sparkle:dsaSignature="MC0CFC7+7qp8frwZsNq2uDKyx3nEDw10AhUA4cj44vvMUiFB63oVZay/zZxcAGU="
-                 length="9008094"
+                 length="8906932"
                  type="application/octet-stream"/>
     </item>
   </channel>