diff options
| author | Jason Zaugg <jzaugg@gmail.com> | 2016-02-10 12:56:14 +1000 |
|---|---|---|
| committer | Jason Zaugg <jzaugg@gmail.com> | 2016-02-10 12:56:14 +1000 |
| commit | fca51b24115ad17a26a144b394a18471ea356155 (patch) | |
| tree | 28517374ed747afa892f4bcae09e92d5d4dd20f9 /src/intellij/scala.ipr.SAMPLE | |
| parent | b0beb720e70cc8700a593766ad6c384e8826bf52 (diff) | |
| parent | 8f8f81b72ef07140952aeb76120bd032e35cc918 (diff) | |
| download | scala-fca51b24115ad17a26a144b394a18471ea356155.tar.gz scala-fca51b24115ad17a26a144b394a18471ea356155.tar.bz2 scala-fca51b24115ad17a26a144b394a18471ea356155.zip | |
Merge branch '2.11.x' into topic/merge-2.11.x-to-2.12.x-20160210
Conflicts:
src/library/scala/collection/Iterator.scala
|
`-- trivial conflicts only. Parens were added to the
next() calls in 2.12.x, while in the meantime
`{Concat,Join}Iterator` were optimized in 2.11.x
Diffstat (limited to 'src/intellij/scala.ipr.SAMPLE')
| -rw-r--r-- | src/intellij/scala.ipr.SAMPLE | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/intellij/scala.ipr.SAMPLE b/src/intellij/scala.ipr.SAMPLE index c4c6a2e44f..e88d6ef257 100644 --- a/src/intellij/scala.ipr.SAMPLE +++ b/src/intellij/scala.ipr.SAMPLE @@ -44,6 +44,7 @@ <module fileurl="file://$PROJECT_DIR$/reflect.iml" filepath="$PROJECT_DIR$/reflect.iml" /> <module fileurl="file://$PROJECT_DIR$/repl.iml" filepath="$PROJECT_DIR$/repl.iml" /> <module fileurl="file://$PROJECT_DIR$/scala.iml" filepath="$PROJECT_DIR$/scala.iml" /> + <module fileurl="file://$PROJECT_DIR$/scala-build.iml" filepath="$PROJECT_DIR$/scala-build.iml" /> <module fileurl="file://$PROJECT_DIR$/scaladoc.iml" filepath="$PROJECT_DIR$/scaladoc.iml" /> <module fileurl="file://$PROJECT_DIR$/scalap.iml" filepath="$PROJECT_DIR$/scalap.iml" /> <module fileurl="file://$PROJECT_DIR$/test.iml" filepath="$PROJECT_DIR$/test.iml" /> @@ -123,4 +124,4 @@ <SOURCES /> </library> </component> -</project>
\ No newline at end of file +</project> |