Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Copyright (c) 2012-2013 EPFL
Copyright (c) 2012-2013 Typesafe, Inc.
Copyright (C) 2012-2014 EPFL
Copyright (C) 2012-2014 Typesafe, Inc.

All rights reserved.

Expand Down
2 changes: 1 addition & 1 deletion src/main/scala/scala/async/Async.scala
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2012 Typesafe Inc. <http://www.typesafe.com>
* Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
*/

package scala.async
Expand Down
2 changes: 1 addition & 1 deletion src/main/scala/scala/async/internal/AnfTransform.scala
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

/*
* Copyright (C) 2012 Typesafe Inc. <http://www.typesafe.com>
* Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
*/

package scala.async.internal
Expand Down
2 changes: 1 addition & 1 deletion src/main/scala/scala/async/internal/AsyncAnalysis.scala
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2012 Typesafe Inc. <http://www.typesafe.com>
* Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
*/

package scala.async.internal
Expand Down
2 changes: 1 addition & 1 deletion src/main/scala/scala/async/internal/AsyncBase.scala
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2012 Typesafe Inc. <http://www.typesafe.com>
* Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
*/

package scala.async.internal
Expand Down
2 changes: 1 addition & 1 deletion src/main/scala/scala/async/internal/AsyncId.scala
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2012 Typesafe Inc. <http://www.typesafe.com>
* Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
*/

package scala.async.internal
Expand Down
2 changes: 1 addition & 1 deletion src/main/scala/scala/async/internal/AsyncUtils.scala
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2012 Typesafe Inc. <http://www.typesafe.com>
* Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
*/
package scala.async.internal

Expand Down
2 changes: 1 addition & 1 deletion src/main/scala/scala/async/internal/ExprBuilder.scala
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2012 Typesafe Inc. <http://www.typesafe.com>
* Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
*/
package scala.async.internal

Expand Down
2 changes: 1 addition & 1 deletion src/main/scala/scala/async/internal/FutureSystem.scala
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2012 Typesafe Inc. <http://www.typesafe.com>
* Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
*/
package scala.async.internal

Expand Down
2 changes: 1 addition & 1 deletion src/main/scala/scala/async/internal/StateAssigner.scala
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2012 Typesafe Inc. <http://www.typesafe.com>
* Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
*/

package scala.async.internal
Expand Down
2 changes: 1 addition & 1 deletion src/main/scala/scala/async/internal/TransformUtils.scala
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2012 Typesafe Inc. <http://www.typesafe.com>
* Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
*/
package scala.async.internal

Expand Down
2 changes: 1 addition & 1 deletion src/test/scala/scala/async/TestLatch.scala
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2012 Typesafe Inc. <http://www.typesafe.com>
* Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
*/

package scala.async
Expand Down
2 changes: 1 addition & 1 deletion src/test/scala/scala/async/TreeInterrogation.scala
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2012 Typesafe Inc. <http://www.typesafe.com>
* Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
*/

package scala.async
Expand Down
2 changes: 1 addition & 1 deletion src/test/scala/scala/async/neg/LocalClasses0Spec.scala
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2012 Typesafe Inc. <http://www.typesafe.com>
* Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
*/

package scala.async
Expand Down
2 changes: 1 addition & 1 deletion src/test/scala/scala/async/neg/NakedAwait.scala
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2012 Typesafe Inc. <http://www.typesafe.com>
* Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
*/

package scala.async
Expand Down
2 changes: 1 addition & 1 deletion src/test/scala/scala/async/neg/SampleNegSpec.scala
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2012 Typesafe Inc. <http://www.typesafe.com>
* Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
*/

package scala.async
Expand Down
2 changes: 1 addition & 1 deletion src/test/scala/scala/async/package.scala
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2012 Typesafe Inc. <http://www.typesafe.com>
* Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
*/

package scala
Expand Down
2 changes: 1 addition & 1 deletion src/test/scala/scala/async/run/anf/AnfTransformSpec.scala
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2012 Typesafe Inc. <http://www.typesafe.com>
* Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
*/

package scala.async
Expand Down
4 changes: 2 additions & 2 deletions src/test/scala/scala/async/run/await0/Await0Spec.scala
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
/*
* Copyright (C) 2012 Typesafe Inc. <http://www.typesafe.com>
* Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
*/

package scala.async
package run
package await0

/**
* Copyright (C) 2012 Typesafe Inc. <http://www.typesafe.com>
* Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
*/

import language.{reflectiveCalls, postfixOps}
Expand Down
2 changes: 1 addition & 1 deletion src/test/scala/scala/async/run/block0/AsyncSpec.scala
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2012 Typesafe Inc. <http://www.typesafe.com>
* Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
*/

package scala.async
Expand Down
2 changes: 1 addition & 1 deletion src/test/scala/scala/async/run/block1/block1.scala
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2012 Typesafe Inc. <http://www.typesafe.com>
* Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
*/

package scala.async
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2012 Typesafe Inc. <http://www.typesafe.com>
* Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
*/

package scala.async
Expand Down
2 changes: 1 addition & 1 deletion src/test/scala/scala/async/run/futures/FutureSpec.scala
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2012 Typesafe Inc. <http://www.typesafe.com>
* Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
*/

package scala.async
Expand Down
2 changes: 1 addition & 1 deletion src/test/scala/scala/async/run/hygiene/Hygiene.scala
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2012 Typesafe Inc. <http://www.typesafe.com>
* Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
*/

package scala.async
Expand Down
2 changes: 1 addition & 1 deletion src/test/scala/scala/async/run/ifelse0/IfElse0.scala
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2012 Typesafe Inc. <http://www.typesafe.com>
* Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
*/

package scala.async
Expand Down
2 changes: 1 addition & 1 deletion src/test/scala/scala/async/run/ifelse0/WhileSpec.scala
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2012 Typesafe Inc. <http://www.typesafe.com>
* Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
*/

package scala.async
Expand Down
2 changes: 1 addition & 1 deletion src/test/scala/scala/async/run/ifelse1/IfElse1.scala
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2012 Typesafe Inc. <http://www.typesafe.com>
* Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
*/

package scala.async
Expand Down
2 changes: 1 addition & 1 deletion src/test/scala/scala/async/run/ifelse2/ifelse2.scala
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2012 Typesafe Inc. <http://www.typesafe.com>
* Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
*/

package scala.async
Expand Down
2 changes: 1 addition & 1 deletion src/test/scala/scala/async/run/ifelse3/IfElse3.scala
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2012 Typesafe Inc. <http://www.typesafe.com>
* Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
*/

package scala.async
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2012-2013 Typesafe Inc. <http://www.typesafe.com>
* Copyright (C) 2012-2014-2013 Typesafe Inc. <http://www.typesafe.com>
*/

package scala.async
Expand Down
2 changes: 1 addition & 1 deletion src/test/scala/scala/async/run/match0/Match0.scala
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2012 Typesafe Inc. <http://www.typesafe.com>
* Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
*/

package scala.async
Expand Down
2 changes: 1 addition & 1 deletion src/test/scala/scala/async/run/noawait/NoAwaitSpec.scala
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2012 Typesafe Inc. <http://www.typesafe.com>
* Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
*/

package scala.async
Expand Down
2 changes: 1 addition & 1 deletion src/test/scala/scala/async/run/toughtype/ToughType.scala
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2012 Typesafe Inc. <http://www.typesafe.com>
* Copyright (C) 2012-2014 Typesafe Inc. <http://www.typesafe.com>
*/

package scala.async
Expand Down