mirror of
https://github.com/kennethreitz-archive/gitx.git
synced 2026-06-05 23:40:18 +00:00
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:
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user