Skip to content

Commit 7832a06

Browse files
SethTisueSethTisue
authored
Merge pull request scala/scala#10960 from SethTisue/merge-2.12-to-2.13-20241219
Merge 2.12 to 2.13, updating copyrights [ci: last-only]
2 parents 7e58d87 + e1a11db commit 7832a06

File tree

570 files changed

+571
-571
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

570 files changed

+571
-571
lines changed

‎library/src/scala/AnyVal.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* Scala (https://www.scala-lang.org)
33
*
4-
* Copyright EPFL and Lightbend, Inc.
4+
* Copyright EPFL and Lightbend, Inc. dba Akka
55
*
66
* Licensed under Apache License 2.0
77
* (http://www.apache.org/licenses/LICENSE-2.0).

‎library/src/scala/AnyValCompanion.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* Scala (https://www.scala-lang.org)
33
*
4-
* Copyright EPFL and Lightbend, Inc.
4+
* Copyright EPFL and Lightbend, Inc. dba Akka
55
*
66
* Licensed under Apache License 2.0
77
* (http://www.apache.org/licenses/LICENSE-2.0).

‎library/src/scala/App.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* Scala (https://www.scala-lang.org)
33
*
4-
* Copyright EPFL and Lightbend, Inc.
4+
* Copyright EPFL and Lightbend, Inc. dba Akka
55
*
66
* Licensed under Apache License 2.0
77
* (http://www.apache.org/licenses/LICENSE-2.0).

‎library/src/scala/Array.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* Scala (https://www.scala-lang.org)
33
*
4-
* Copyright EPFL and Lightbend, Inc.
4+
* Copyright EPFL and Lightbend, Inc. dba Akka
55
*
66
* Licensed under Apache License 2.0
77
* (http://www.apache.org/licenses/LICENSE-2.0).

‎library/src/scala/Boolean.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* Scala (https://www.scala-lang.org)
33
*
4-
* Copyright EPFL and Lightbend, Inc.
4+
* Copyright EPFL and Lightbend, Inc. dba Akka
55
*
66
* Licensed under Apache License 2.0
77
* (http://www.apache.org/licenses/LICENSE-2.0).

‎library/src/scala/Byte.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* Scala (https://www.scala-lang.org)
33
*
4-
* Copyright EPFL and Lightbend, Inc.
4+
* Copyright EPFL and Lightbend, Inc. dba Akka
55
*
66
* Licensed under Apache License 2.0
77
* (http://www.apache.org/licenses/LICENSE-2.0).

‎library/src/scala/Char.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* Scala (https://www.scala-lang.org)
33
*
4-
* Copyright EPFL and Lightbend, Inc.
4+
* Copyright EPFL and Lightbend, Inc. dba Akka
55
*
66
* Licensed under Apache License 2.0
77
* (http://www.apache.org/licenses/LICENSE-2.0).

‎library/src/scala/Console.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* Scala (https://www.scala-lang.org)
33
*
4-
* Copyright EPFL and Lightbend, Inc.
4+
* Copyright EPFL and Lightbend, Inc. dba Akka
55
*
66
* Licensed under Apache License 2.0
77
* (http://www.apache.org/licenses/LICENSE-2.0).

‎library/src/scala/DelayedInit.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* Scala (https://www.scala-lang.org)
33
*
4-
* Copyright EPFL and Lightbend, Inc.
4+
* Copyright EPFL and Lightbend, Inc. dba Akka
55
*
66
* Licensed under Apache License 2.0
77
* (http://www.apache.org/licenses/LICENSE-2.0).

‎library/src/scala/Double.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
* Scala (https://www.scala-lang.org)
33
*
4-
* Copyright EPFL and Lightbend, Inc.
4+
* Copyright EPFL and Lightbend, Inc. dba Akka
55
*
66
* Licensed under Apache License 2.0
77
* (http://www.apache.org/licenses/LICENSE-2.0).

0 commit comments

Comments
 (0)