Merge remote-tracking branch 'refs/remotes/laullon/master' into comments

Conflicts: PBGitHistoryController.h PBGitWindowController.h
kelan · Jun 19, 2011 · 4e456d1 · 4e456d1
2 parents 30cbf1a + 1b9e07c
commit 4e456d1
Show file tree

Hide file tree

Showing 71 changed files with 2,944 additions and 2,917 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
+.DS_Store
 build
 build/revision
 ._*

diff --git a/.gitmodules b/.gitmodules
diff --git a/ApplicationController.m b/ApplicationController.m
@@ -68,8 +68,8 @@ - (void)applicationDidFinishLaunching:(NSNotification*)notification
 
     if ([PBGitDefaults useAskPasswd]) {
 	// Make sure Git's SSH password requests get forwarded to our little UI tool:
-        setenv( "SSH_ASKPASS", [[[NSBundle mainBundle] pathForResource: @"gitx_askpasswd" ofType: @""] UTF8String], 1 );
-        setenv( "DISPLAY", "localhost:0", 1 );
+	setenv( "SSH_ASKPASS", [[[NSBundle mainBundle] pathForResource: @"gitx_askpasswd" ofType: @""] UTF8String], 1 );
+	setenv( "DISPLAY", "localhost:0", 1 );
     }
 
 	[self registerServices];

diff --git a/Commands/PBCommandFactory.h b/Commands/PBCommandFactory.h
@@ -7,6 +7,7 @@
 //
 
 #import "PBGitRepository.h"
+#import "PBPresentable.h"
 
 @protocol PBCommandFactory
 + (NSArray *) commandsForObject:(id<PBPresentable>) object repository:(PBGitRepository *) repository;

diff --git a/DBPrefsWindowController.h b/DBPrefsWindowController.h
@@ -42,7 +42,7 @@
 #import <Cocoa/Cocoa.h>
 
 
-@interface DBPrefsWindowController : NSWindowController /*<NSAnimationDelegate,NSToolbarDelegate>*/{
+@interface DBPrefsWindowController : NSWindowController PROTOCOL_10_6(NSAnimationDelegate,NSToolbarDelegate){
 	NSMutableArray *toolbarIdentifiers;
 	NSMutableDictionary *toolbarViews;
 	NSMutableDictionary *toolbarItems;