Merge branch 'master' of git://github.com/b4winckler/macvim

splhack · splhack · commit a496b0ea180d · 2013-08-13T16:33:12.000-07:00
Conflicts:
	src/MacVim/Info.plist
	src/auto/configure
diff --git a/runtime/doc/gui_mac.txt b/runtime/doc/gui_mac.txt
@@ -1,4 +1,4 @@
-*gui_mac.txt*	For Vim version 7.4a.  Last change: 2012 Jan 13
+*gui_mac.txt*	For Vim version 7.4.  Last change: 2012 Jan 13
 
 
 		  VIM REFERENCE MANUAL    by Bjorn Winckler
diff --git a/src/MacVim/Info.plist b/src/MacVim/Info.plist
@@ -1232,7 +1232,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>20130713</string>
+	<string>20130813</string>
 	<key>NSMainNibFile</key>
 	<string>MainMenu</string>
 	<key>NSPrincipalClass</key>
diff --git a/src/MacVim/MacVim.xcodeproj/project.pbxproj b/src/MacVim/MacVim.xcodeproj/project.pbxproj
@@ -736,7 +736,7 @@
 			buildSettings = {
 				ARCHS = "$(NATIVE_ARCH_ACTUAL)";
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 68;
+				CURRENT_PROJECT_VERSION = 70;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",
@@ -769,7 +769,7 @@
 			buildSettings = {
 				ARCHS = "$(NATIVE_ARCH_ACTUAL)";
 				COPY_PHASE_STRIP = YES;
-				CURRENT_PROJECT_VERSION = 68;
+				CURRENT_PROJECT_VERSION = 70;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(FRAMEWORK_SEARCH_PATHS_QUOTED_FOR_TARGET_1)",

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-gui_mac.txt For Vim version 7.4a. Last change: 2012 Jan 13`
	`1`	`+gui_mac.txt For Vim version 7.4. Last change: 2012 Jan 13`
`2`	`2`
`3`	`3`
`4`	`4`	`VIM REFERENCE MANUAL by Bjorn Winckler`