diff options
| author | Jason Zaugg <jzaugg@gmail.com> | 2015-07-23 12:25:49 +1000 |
|---|---|---|
| committer | Jason Zaugg <jzaugg@gmail.com> | 2015-07-23 12:25:49 +1000 |
| commit | 96fd54b2f05152bd433f288049ab929f9965b16d (patch) | |
| tree | 1a3017c4d039ebe1c4d8e6a75395efbfbc2890f4 /src/intellij/scaladoc.iml.SAMPLE | |
| parent | f6756eaaa5504538f8fa23fc37f8728e56f76908 (diff) | |
| parent | 0e9525aa618a2eca143a1c7379ff1e6efd23b86e (diff) | |
| download | scala-96fd54b2f05152bd433f288049ab929f9965b16d.tar.gz scala-96fd54b2f05152bd433f288049ab929f9965b16d.tar.bz2 scala-96fd54b2f05152bd433f288049ab929f9965b16d.zip | |
Merge remote-tracking branch 'origin/2.11.x' into merge/2.11.x-to-2.12.x-20152307
Diffstat (limited to 'src/intellij/scaladoc.iml.SAMPLE')
| -rw-r--r-- | src/intellij/scaladoc.iml.SAMPLE | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/intellij/scaladoc.iml.SAMPLE b/src/intellij/scaladoc.iml.SAMPLE index 4ba0a848c6..6e6d98b396 100644 --- a/src/intellij/scaladoc.iml.SAMPLE +++ b/src/intellij/scaladoc.iml.SAMPLE @@ -14,5 +14,6 @@ <orderEntry type="library" name="scaladoc-deps" level="project" /> <orderEntry type="library" name="ant" level="project" /> <orderEntry type="library" name="partest" level="project" /> + <orderEntry type="library" name="asm" level="project" /> </component> </module>
\ No newline at end of file |