Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Previous Window (base release/1.6.1) #143

Merged

Conversation

kojiishi
Copy link

Re-created from #132 to change the base branch and to get the better diffs.

Two notes:

  • This pull request contains a change to README.md since this branch was once merged with develop. It should be ok, as long as you'll merge to develop sometime in future.
  • This pull request will conflict with Fixes xib regressions #142 (fix XIB regressions.) I recommend taking Fixes xib regressions #142 first, and I'll update this pull request. I wished to create a pull request that you could merge both at once, but it looks like I can't set base branch to my own, so this looks like the only way to go.

Other than that, the patch looks clean (i.e., contains my changes only.)

@kojiishi kojiishi changed the title Feature/previous window 1.6.1 Previous Window (base release/1.6.1) Jun 22, 2014
@fikovnik
Copy link
Owner

Great! I merged in the #142 so you can recreate this patch to be finally merged in. Thanks a lot!

@kojiishi
Copy link
Author

Welcome back, Filip. The patch is ready to merge.
Note that changes in PR #141 wasn't easy to merge as both changes geometries in XIB. I tried my best but probably I might have undone some of them, or did it incorrectly, apologize in advance.

fikovnik added a commit that referenced this pull request Jun 30, 2014
@fikovnik fikovnik merged commit ccc2e4d into fikovnik:release/1.6.1 Jun 30, 2014
@fikovnik
Copy link
Owner

Thanks a lot for all the work. I know it was not an easy one and I really appreciate all your effort. I will give it a spin and then I will make a new release.

@fikovnik fikovnik added this to the 1.6.1 milestone Jun 30, 2014
@kojiishi
Copy link
Author

Thanks a lot from me! This many back-and-forth and two persons sending PR for the same XIB must have been hard for you to handle. I appreciate your efforts to bring this to be merged.
Note that you probably want to take #144 too before making a release. NoX11 build is broken (does not copy compiled NIB file) since the localization was done.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants