Skip to content

Noop merge of 2.10.x to master. #134

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

Merged
merged 8 commits into from
Jul 30, 2015
Merged

Noop merge of 2.10.x to master. #134

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
2d6d5eb
Update SBT for the warn command, now assumed by sbt-extras
retronym Jul 27, 2015
ad6c3c0
Merge pull request #124 from retronym/backport/sbt-bump
retronym Jul 27, 2015
dc3fd62
[backport] Cleanup code generation by avoiding redundant blocks
retronym Jul 29, 2015
a23cfa3
[backport] Avoid dead code warnings in generated code.
retronym Jul 29, 2015
3654f22
[backport] Avoid dead code warning with async(throw T)
retronym Jul 29, 2015
62bb8cf
[backport] Stop test compiler before code generation
retronym Jul 29, 2015
f9e170e
[backport] Make nsc.Global based tests work under SBT
retronym Jul 30, 2015
3018bea
Merge commit 'f9e170e3187f83c5d00e9ea8128fe2edf2bd371c' into merge/2.…
retronym Jul 30, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view

These merge commits were added into this branch cleanly.

There are no new changes to show.