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.

Sign up for GitHub

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

Jump to bottom

Updated all cross-platform functions and types up to 8 June 2016 #4

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Updated all cross-platform functions and types up to 8 June 2016 #4

wants to merge 2 commits into from

Conversation

zeyonaut
Copy link

I have not updated two OSX-specific functions,

uiDarwinMarginAmount() and uiDarwinPaddingAmount().

I'm not exactly sure how this should be done.

@zeyonaut
Copy link
Author

Sorry about it being in multiple commits. Also, the previous pr (I closed) did not update, so I made a new one. My apologies.

@ghost
Copy link

ghost commented Jun 17, 2016 •
edited by ghost
Loading

  • git rebase -i origin/master
  • don't touch the first line.
  • from line 2 to last line replace all the pick by fixup.
  • save and then push with -f.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@zeyonaut