summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* SI-9167 Clarify ScalaVersion parsingSom Snytt2015-02-204-31/+65
* Merge pull request #4287 from adriaanm/ci-2.12-ide-nopAdriaan Moors2015-02-021-0/+3
|\
| * Punt on IDE validation in 2.12.x...Adriaan Moors2015-02-021-0/+3
|/
* Merge pull request #4272 from retronym/merge/2.11.x-to-2.12.x-20150129Jason Zaugg2015-02-02702-3421/+13507
|\
| * Refer to 2.12 in new release scriptsJason Zaugg2015-01-291-2/+2
| * Merge remote-tracking branch 'origin/2.11.x' into merge/2.11.x-to-2.12.x-2015...Jason Zaugg2015-01-29204-579/+3368
| |\
| | * Merge pull request #4271 from retronym/ticket/8642Adriaan Moors2015-01-283-3/+28
| | |\
| | | * SI-8642 Enable OSGi tests under Java 8Jason Zaugg2015-01-281-1/+1
| | | * Add an IntelliJ module for the Pax Exam based OSGi testsJason Zaugg2015-01-283-2/+27
| | |/
| | * Merge pull request #4268 from adriaanm/new-ci-validationAdriaan Moors2015-01-285-71/+249
| | |\
| | | * IDE validation: run on last commitAdriaan Moors2015-01-271-0/+32
| | | * New PR validationAdriaan Moors2015-01-214-71/+217
| | * | Merge pull request #4214 from som-snytt/issue/5154Jason Zaugg2015-01-222-4/+12
| | |\ \
| | | * | SI-5154 Parse leading literal brace in XML patternSom Snytt2014-12-162-4/+12
| | * | | Merge pull request #4190 from kanielc/SI-5817Jason Zaugg2015-01-222-0/+20
| | |\ \ \ | | | |_|/ | | |/| |
| | | * | SI-5817: Add header to language.scala and languageFeature.scalaDenton Cockburn2014-12-052-0/+20
| | * | | Merge pull request #4253 from retronym/ticket/9087Grzegorz Kossakowski2015-01-203-8/+74
| | |\ \ \
| | | * | | SI-9087 Fix min/max of reversed Double/Float orderingsJason Zaugg2015-01-203-8/+74
| | * | | | Merge pull request #4247 from adriaanm/2.11.5-bumpGrzegorz Kossakowski2015-01-203-5/+10
| | |\ \ \ \
| | | * | | | Bump versions for 2.11.5 release.Adriaan Moors2015-01-042-5/+5
| | | * | | | TODO notes for release scriptAdriaan Moors2015-01-041-0/+5
| | * | | | | Merge pull request #4210 from lrytz/opt/classBTypeFromClassfileGrzegorz Kossakowski2015-01-1916-184/+536
| | |\ \ \ \ \
| | | * | | | | Address review feedbackLukas Rytz2015-01-164-19/+44
| | | * | | | | Construct ClassBTypes from parsed classfilesLukas Rytz2015-01-1613-101/+421
| | | * | | | | Cleanup asm-to-string debug helpersLukas Rytz2015-01-162-14/+64
| | | * | | | | Remove an unnecessary hash map in BTypesFromSymbolsLukas Rytz2015-01-161-12/+5
| | | * | | | | Type alias for InternalNameLukas Rytz2015-01-162-5/+17
| | | * | | | | Make ClassBType independent of the name tableLukas Rytz2015-01-163-60/+12
| | |/ / / / /
| | * | | | | Merge pull request #4249 from retronym/ticket/9089Vlad Ureche2015-01-164-1/+7
| | |\ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | | * | | | SI-9089 Another REPL/FSC + specialization bug fixJason Zaugg2015-01-154-1/+7
| | * | | | | Merge pull request #4201 from mpociecha/fix-typos-in-docs-and-commentsGrzegorz Kossakowski2015-01-14139-232/+232
| | |\ \ \ \ \
| | | * | | | | Fix many typos in docs and commentsmpociecha2014-12-14140-233/+233
| | * | | | | | Merge pull request #4234 from JanBessai/ShowCodeEscapeFixGrzegorz Kossakowski2015-01-142-1/+4
| | |\ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| | | * | | | | SI-9057 - fix `showCode` to put backticks around names including dotsJan Bessai2015-01-072-1/+4
| | | | |/ / / | | | |/| | |
| | * | | | | Merge pull request #4200 from er1c/typoJason Zaugg2015-01-091-1/+1
| | |\ \ \ \ \
| | | * | | | | Fix scaladoc OutpuStream typoEric Peters2014-12-121-1/+1
| | | | |/ / / | | | |/| | |
| | * | | | | Merge pull request #4229 from Kornel/feature/SI-9067-enumeration-with-name-im...Grzegorz Kossakowski2015-01-081-1/+2
| | |\ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | | * | | | SI-9067: Enumeration withName improvementKornel Kielczewski2015-01-051-1/+2
| | * | | | | Merge pull request #4222 from gbasler/topic/patmat-unit-tests-rebasedv2.11.5Adriaan Moors2015-01-012-1/+567
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
| | | * | | | Add unit tests for Tseitin CNF conversion.Gerard Basler2014-12-291-0/+555
| | | * | | | Bugfix: Implement missing `equals` method for `Sym`.Gerard Basler2014-12-291-1/+12
| | * | | | | Merge pull request #4225 from adriaanm/jobsAdriaan Moors2014-12-293-0/+672
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
| | | * | | | Towards travis-style CIAdriaan Moors2014-12-292-290/+87
| | | * | | | Import scripts verbatim from jenkin-scriptsAdriaan Moors2014-12-294-0/+875
| | |/ / / /
| | * | | | Merge pull request #4139 from retronym/ticket/7965Adriaan Moors2014-12-236-0/+90
| | |\ \ \ \
| | | * \ \ \ Merge pull request #8 from lrytz/7965-specJason Zaugg2014-12-191-0/+13
| | | |\ \ \ \
| | | | * | | | Spec update for signature polymorphic methodsLukas Rytz2014-12-181-0/+13
| | | |/ / / /
| | | * | | | SI-7965 Support calls to MethodHandle.{invoke,invokeExact}Jason Zaugg2014-12-035-0/+77
| | * | | | | Merge pull request #4208 from lrytz/t9044Adriaan Moors2014-12-235-49/+45
| | |\ \ \ \ \
| | | * | | | | SI-9044 Fix order of interfaces in classfilesLukas Rytz2014-12-185-49/+45