summaryrefslogtreecommitdiff
path: root/src/intellij/scala.ipr.SAMPLE
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '2.11.x' into topic/merge-2.11.x-to-2.12.x-20160210Jason Zaugg2016-02-101-1/+2
|\
| * Enable IntellIJ smarts while editing the buildJason Zaugg2016-02-071-1/+2
| * intellij project files for ASM removalLukas Rytz2015-05-111-2/+9
* | for 2.12, bump JDK version (6 -> 8) in IntelliJ sample configSeth Tisue2015-11-091-1/+1
* | Remove further references to forkjoinJason Zaugg2015-07-151-1/+0
* | Merge commit '1b7e660' into merge-2.11-may-12Lukas Rytz2015-05-121-3/+9
|/
* Update intellij project files for IDEA 14.1 and latest Scala pluginLukas Rytz2015-05-011-0/+121