summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge commit '27aada2' into merge-2.11-to-2.12-sep-22Lukas Rytz2015-09-220-0/+0
|\
| * Merge pull request #4752 from alexeyr/topic/errornonexistentfield-messageLukas Rytz2015-09-212-6/+6
| |\
| | * [backport] Include owner in ErrorNonExistentField messageAlexey Romanov2015-09-182-6/+6
* | | Merge commit 'a170c99' into 2.12.xLukas Rytz2015-09-22135-102/+258
|\| |
| * | Merge pull request #4755 from SethTisue/fix-t9370-on-WindowsLukas Rytz2015-09-211-1/+1
| |\ \
| | * | fix t9370 so it works on Windows tooSeth Tisue2015-09-181-1/+1
| * | | Merge pull request #4754 from SethTisue/bump-partest-versionSeth Tisue2015-09-202-2/+2
| |\ \ \ | | |_|/ | |/| |
| | * | use latest partest (1.0.9)Seth Tisue2015-09-182-2/+2
| | |/
| * | Merge pull request #4724 from retronym/topic/positioned-errorsLukas Rytz2015-09-181-8/+12
| |\ \ | | |/ | |/|
| | * Try harder to avoid reporting unpositioned errorsJason Zaugg2015-09-021-8/+12
| * | Merge pull request #4748 from VladUreche/issue/9475Seth Tisue2015-09-172-0/+22
| |\ \
| | * | SI-9475 Dependent PolyTypes are dependent typesVlad Ureche2015-09-172-0/+22
| |/ /
| * | Merge pull request #4746 from sschaef/update-ant-buildLukas Rytz2015-09-161-0/+5
| |\ \
| | * | Abort Ant build if Ant version is <1.9Simon Schäfer2015-09-161-0/+5
| |/ /
| * | Merge pull request #4738 from janekdb/2.11.x-urls-driftedSeth Tisue2015-09-157-10/+9
| |\ \
| | * | Improve drifted URLsJanek Bogucki2015-09-097-10/+9
| * | | Merge pull request #4728 from janekdb/2.11.x-urls-docs-codehaus-citeseerSeth Tisue2015-09-158-8/+11
| |\ \ \
| | * | | Update links to docs, codehaus and citeseerJanek Bogucki2015-09-048-8/+11
| * | | | Merge pull request #4742 from janekdb/2.11.x-scaladoc-in-context-ListSeth Tisue2015-09-151-1/+1
| |\ \ \ \
| | * | | | Restore missing element type to List class documentationJanek Bogucki2015-09-111-1/+1
| | | |/ / | | |/| |
| * | | | Merge pull request #4743 from SethTisue/modernize-sbt-buildSeth Tisue2015-09-152-4/+4
| |\ \ \ \
| | * | | | sbt build: appropriately restrict scope of ScalaCheck dependencySeth Tisue2015-09-141-1/+1
| | * | | | sbt build: remove redundancy w/ versions.propertiesSeth Tisue2015-09-141-2/+2
| | * | | | sbt build: bring versions up to date with versions.propertiesSeth Tisue2015-09-141-3/+3
| | * | | | upgrade sbt from 0.13.7 to 0.13.9Seth Tisue2015-09-141-1/+1
| * | | | | Merge pull request #4727 from SethTisue/unset-stray-execute-bitsSeth Tisue2015-09-14108-0/+0
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | unset inappropriate execute bitsSeth Tisue2015-09-02108-0/+0
| * | | | | Merge pull request #4740 from gbasler/ticket/SI-9369Seth Tisue2015-09-143-1/+30
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | SI-9369 Fix pattern matcher warnings for diamond shaped inheritance.Gerard Basler2015-09-123-1/+30
| |/ / / /
| * | | | Merge pull request #4714 from Ichoran/issue/9407Seth Tisue2015-09-081-10/+1
| |\ \ \ \
| | * | | | SI-9407 Vector implementation bit-shift bugfixRex Kerr2015-08-291-10/+1
| | |/ / /
| * | | | Merge pull request #4333 from Ichoran/opt-Iterator-2.11.xSeth Tisue2015-09-081-59/+162
| |\ \ \ \
| | * | | | Performance optimization - Iterator span, collect, dropWhileRex Kerr2015-08-071-35/+138
| | * | | | Performance optimization - Iterator flatMap, find, indexWhere, indexOfRex Kerr2015-08-071-24/+24
| * | | | | Merge pull request #4713 from SethTisue/batch-of-typosJason Zaugg2015-09-088-12/+12
| |\ \ \ \ \
| | * | | | | fix assorted typosSeth Tisue2015-08-287-11/+11
| | * | | | | fix trivial error in specSeth Tisue2015-08-281-1/+1
| | | |/ / / | | |/| | |
| * | | | | Merge pull request #4722 from janekdb/2.11.x-scaladoc-in-context-AnyValDick Wall2015-09-062-2/+2
| |\ \ \ \ \
| | * | | | | Link to completed value classes SIP page instead of pending versionJanek Bogucki2015-09-012-2/+2
| | | |_|_|/ | | |/| | |
| * | | | | Merge pull request #4706 from VladUreche/issue/tree-checkerJason Zaugg2015-09-061-1/+8
| |\ \ \ \ \
| | * | | | | Re-enable tree checkersVlad Ureche2015-08-241-1/+8
| * | | | | | Merge pull request #4704 from VladUreche/issue/9442Jason Zaugg2015-09-064-10/+69
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| | * | | | | SI-9442 Fix the uncurry-erasure typesVlad Ureche2015-08-234-10/+69
| * | | | | | Merge pull request #4726 from janekdb/2.11.x-now-Oracle-urlsSeth Tisue2015-09-037-7/+7
| |\ \ \ \ \ \
| | * | | | | | Update Java and Sun URLs to replacement Java and Oracle URLsJanek Bogucki2015-09-027-7/+7
| * | | | | | | Merge pull request #4715 from Ichoran/issue/9424Seth Tisue2015-09-021-2/+13
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | SI-9424 Clarify behavior of PriorityQueue toStringRex Kerr2015-08-291-2/+13
| | | |_|_|/ / | | |/| | | |
| * | | | | | Merge pull request #4701 from janekdb/2.11.x-scaladoc-in-context-OptionSeth Tisue2015-09-021-1/+1
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| | * | | | | Improve implementation comments in Option.collect exampleJanek Bogucki2015-08-311-1/+1
| * | | | | | Merge pull request #4692 from JanBessai/Fix-SI-6636Adriaan Moors2015-08-314-0/+47
| |\ \ \ \ \ \