diff options
| author | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-05-02 13:21:06 +0200 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-05-02 16:18:35 +0200 |
| commit | 49f50727944a478bc5d10ad0658437286f47e422 (patch) | |
| tree | c4e7a931f24cccf3c371fca440ad94dd19efd371 /README.rst | |
| parent | 5819b78c25c9cba25fc84018d3905fe265bb4e18 (diff) | |
| parent | 98972c95ab1e7c0ea2af9c9a958c0de60eb26b3d (diff) | |
| download | scala-49f50727944a478bc5d10ad0658437286f47e422.tar.gz scala-49f50727944a478bc5d10ad0658437286f47e422.tar.bz2 scala-49f50727944a478bc5d10ad0658437286f47e422.zip | |
Merge 2.10.x into master
Conflicts:
bincompat-forward.whitelist.conf
src/compiler/scala/tools/nsc/matching/Patterns.scala
src/compiler/scala/tools/nsc/transform/patmat/Logic.scala
src/compiler/scala/tools/nsc/typechecker/Infer.scala
src/scaladoc/scala/tools/nsc/doc/model/ModelFactory.scala
test/files/neg/t5663-badwarneq.check
Diffstat (limited to 'README.rst')
| -rw-r--r-- | README.rst | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/README.rst b/README.rst index c871adb908..004d7b63d0 100644 --- a/README.rst +++ b/README.rst @@ -189,15 +189,10 @@ In detail: - Scala live git source tree: http://github.com/scala/scala -- Contact form: - http://www.scala-lang.org/node/188 - - -If you are interested in contributing code, we ask you to complete and submit -to us the Scala Contributor License Agreement, which allows us to ensure that -all code submitted to the project is unencumbered by copyrights or patents. -The form is available at: -http://www.scala-lang.org/sites/default/files/contributor_agreement.pdf +If you are interested in contributing code, we ask you to sign the +[Scala Contributor License Agreement](http://typesafe.com/contribute/cla/scala), +which allows us to ensure that all code submitted to the project is +unencumbered by copyrights or patents. Before submitting a pull-request, please make sure you have followed the guidelines outlined in our `Pull Request Policy <https://github.com/scala/scala/wiki/Pull-Request-Policy>`_. |