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

'const' fix and support for specifying retina devices for subliminal-test #45

Merged
merged 2 commits into from
Jul 17, 2013

Conversation

nzhuk
Copy link
Contributor

@nzhuk nzhuk commented Jul 16, 2013

This replaces previous pull request ( #43 )

Nikita Zhuk added 2 commits July 16, 2013 14:05
…expands to const char *

- This fixes compiler warnings: "Sending 'const char [61]' to parameter of type 'char *' discards qualifiers"
…efaults' command. Device model names with spaces ( e.g. 'iPhone (Retina 4-inch)' ) require single-quoting.
wearhere added a commit that referenced this pull request Jul 17, 2013
'const' fix and support for specifying retina devices for subliminal-test
@wearhere wearhere merged commit 5600b09 into inkling:master Jul 17, 2013
@wearhere
Copy link
Contributor

Thanks @nzhuk! Good call on creating a new PR rather than bothering with rebasing. :)

@nzhuk
Copy link
Contributor Author

nzhuk commented Jul 17, 2013

Yeah, I have to learn to use git properly at some better time. My brains are still too much in hg mode, where rewriting history is considered an exception (although it's certainly technically possible)

@wearhere
Copy link
Contributor

Our take at Inkling is, rebase your own (local) history all you like; rebase PRs in consultation with reviewers; never rebase master (barring some terrible mistake). Basically, use rebasing to make changes as clean as possible--before they enter canon.

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

Successfully merging this pull request may close these issues.

2 participants