Merge remote branch 'refs/remotes/dgrijalva/stable' into experimental

Conflicts:
	ApplicationController.m
	GitX.xcodeproj/project.pbxproj
	PBGitCommitView.xib
	PBGitHistoryView.xib
	PBGitRevisionCell.m
	PBGitTree.m
	PBGitWindowController.m
	PBViewController.m
	html/views/history/history.js
	html/views/history/index.html
This commit is contained in:
Nathan Kinsinger
2010-05-29 21:04:21 -06:00
29 changed files with 92 additions and 32 deletions
+2
View File
@@ -17,6 +17,7 @@
#import "PBNSURLPathUserDefaultsTransfomer.h"
#import "PBGitDefaults.h"
#import "PBCloneRepositoryPanel.h"
#import "Sparkle/SUUpdater.h"
@implementation ApplicationController
@synthesize cliProxy;
@@ -65,6 +66,7 @@
- (void)applicationDidFinishLaunching:(NSNotification*)notification
{
[[SUUpdater sharedUpdater] setSendsSystemProfile:YES];
[self registerServices];
BOOL hasOpenedDocuments = NO;