Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: rowanj/gitx
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: builds/0.15/1962
Choose a base ref
...
head repository: rowanj/gitx
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Nov 10, 2014

  1. Break responder loop that crashes on OS X 10.10 Yosamite

    @rowanj
    rowanj committed Nov 10, 2014
    Copy the full SHA
    e546301 View commit details

  2. Add OS X 10.10 fix to the change log

    @rowanj
    rowanj committed Nov 10, 2014
    Copy the full SHA
    ce17d07 View commit details
Showing with 6 additions and 1 deletion.
  1. +1 −1 Classes/Controllers/PBGitWindowController.m
  2. +5 −0 updates/GitX-dev.html
2 changes: 1 addition & 1 deletion Classes/Controllers/PBGitWindowController.m
View file
Original file line number Diff line number Diff line change
@@ -117,7 +117,7 @@ - (void) changeContentController:(PBViewController *)controller
[[contentController view] setFrame:[contentSplitView bounds]];
[contentSplitView addSubview:[contentController view]];

[self setNextResponder: contentController];
// [self setNextResponder: contentController];
[[self window] makeFirstResponder:[contentController firstResponder]];
[contentController updateView];
[contentController addObserver:self forKeyPath:@"status" options:NSKeyValueObservingOptionInitial context:@"statusChange"];
5 changes: 5 additions & 0 deletions updates/GitX-dev.html
View file
Original file line number Diff line number Diff line change
@@ -12,6 +12,11 @@ <h1>GitX-dev Release Notes</h1>
<p>Recent changes made to <a href="https://github.com/rowanj/gitx">GitX-dev</a></p>
</header>
<section>
<h2>Changes since 0.15.1962</h2>
<ul>
<li>Break responder loop that crashes repository window on OS X 10.10</li>
</ul>

<h2>Changes since 0.15.1949</h2>
<ul>
<li>Fix crash when trying to browse for a remote (<a href="https://github.com/rowanj/gitx/issues/255">#255</a>, <a href="https://github.com/rowanj/gitx/pull/370">#370</a>)</li>