summaryrefslogtreecommitdiff
path: root/src/intellij/scala.ipr.SAMPLE
Commit message (Expand)AuthorAgeFilesLines
* 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