diff options
| author | Jason Zaugg <jzaugg@gmail.com> | 2014-03-27 19:57:39 +0100 |
|---|---|---|
| committer | Jason Zaugg <jzaugg@gmail.com> | 2014-03-27 19:57:51 +0100 |
| commit | 7b9446df7411e8dab3fbf9a5a8edb65808d9d14e (patch) | |
| tree | 9bf7b4b58828f93d04700d55ec6ff54d8d02b64e | |
| parent | 5a49226d34bfd2a9ec9f8a5cbae5df4c1b4bc8db (diff) | |
| parent | 9b3bbe4e06994af25c11a4c9210915772171a9d9 (diff) | |
| download | scala-async-7b9446df7411e8dab3fbf9a5a8edb65808d9d14e.tar.gz scala-async-7b9446df7411e8dab3fbf9a5a8edb65808d9d14e.tar.bz2 scala-async-7b9446df7411e8dab3fbf9a5a8edb65808d9d14e.zip | |
Merge remote-tracking branch 'origin/2.10.x' into merge/2.10.x
% export MB=$(git merge-base head origin/2.10.x)
% git log --oneline --graph $MB..origin/2.10.x
* 9b3bbe4 Merge pull request #69 from retronym/backport/ticket/52-lazy-val
|\
| * cf19f02 Incorporate pull request feedback
| * ee66e08 [backport] Allow lazy vals without await in the initializer
|/
* 6808ce4 0.9.1-SNAPSHOT
* a37cf65 0.9.0
* 8f9a0b1 Update to Scala 2.10.4
* b489738 0.9.0-SNAPSHOT
* 5c83eb1 0.9.0-M6
* be38163 [backport] Test case for "not a class" crasher in live variable
* 290c3be Fix substitution in release script message
* c3384d8 Update release script for _2.10 tagging convention
* e3027b1 Update version in README
* 6b344fa 0.9.0-SNAPSHOT
* 8fafd79 0.9.0-M5
* d76bd53 only build 2.10.x on this branch
% git merge -s ours origin/2.10.x
0 files changed, 0 insertions, 0 deletions