diff options
author | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-05-17 16:35:20 -0700 |
---|---|---|
committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-05-17 16:35:20 -0700 |
commit | a23c7e295e0c36998ef84ca5247fc5a948d29af9 (patch) | |
tree | 634f8e7c5118bd44147cd034d761f7cfe11f43c4 /src/build/maven/scala-reflect-pom.xml | |
parent | 16ca3899d1a99e52952a395480e8a8f5960d14d5 (diff) | |
parent | f81a4f92967a2dd69784864e9ab9e1624d7db35b (diff) | |
download | scala-a23c7e295e0c36998ef84ca5247fc5a948d29af9.tar.gz scala-a23c7e295e0c36998ef84ca5247fc5a948d29af9.tar.bz2 scala-a23c7e295e0c36998ef84ca5247fc5a948d29af9.zip |
Merge 2.10.x into master
Conflicts:
src/compiler/scala/tools/nsc/typechecker/Implicits.scala
src/reflect/scala/reflect/runtime/JavaMirrors.scala
Diffstat (limited to 'src/build/maven/scala-reflect-pom.xml')
-rw-r--r-- | src/build/maven/scala-reflect-pom.xml | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/build/maven/scala-reflect-pom.xml b/src/build/maven/scala-reflect-pom.xml index 7a1613f42c..56d2ffc57c 100644 --- a/src/build/maven/scala-reflect-pom.xml +++ b/src/build/maven/scala-reflect-pom.xml @@ -30,7 +30,9 @@ <system>JIRA</system> <url>https://issues.scala-lang.org/</url> </issueManagement> - + <properties> + <info.apiURL>http://www.scala-lang.org/api/@VERSION@/</info.apiURL> + </properties> <dependencies> <dependency> <groupId>org.scala-lang</groupId> |