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

Bump crengine and add cre.setEmbeddedFonts() #501

Merged
merged 1 commit into from
Aug 28, 2017

Conversation

poire-z
Copy link
Contributor

@poire-z poire-z commented Aug 28, 2017

crengine: fix parsing of long decimal values in css and new Polish and French hyph dictionaries
cre.setEmbeddedFonts() to make this crengine feature available to koreader (having a go at koreader/crengine#76)

crengine: fix parsing of long decimal values in css and
new Polish and French hyph dictionaries
cre.setEmbeddedFonts() to make this crengine feature available
to koreader.
@Frenzie
Copy link
Member

Frenzie commented Aug 28, 2017

Feel free to merge once the tests pass.

@poire-z
Copy link
Contributor Author

poire-z commented Aug 28, 2017

Any prefered option for the merge, among a simple click on "Merge pull request", and the popup listed "Create a merge commit", "Squash and merge" and "Rebase and merge" (asking, as this would be my first - btw, thanks!-, and I want to get it right :)

@Frenzie
Copy link
Member

Frenzie commented Aug 28, 2017

All of them are basically fine, but squash & merge and rebase & merge are preferable because they make for a nicer Git log. There's no official policy but what I've been doing recently is squash & merge unless there are a bunch of nicely individually tailored commits inside the PR, even if there's only one commit. That way you also get a reference to the PR #.

@poire-z poire-z merged commit 099793e into koreader:master Aug 28, 2017
@poire-z poire-z deleted the embeddedfonts branch August 28, 2017 17:42
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