From 1e0c7a7d8a69d8bbca7843378c80be9f6912fa5c Mon Sep 17 00:00:00 2001 From: Olivier Blanvillain Date: Mon, 4 Dec 2017 17:14:13 +0100 Subject: [PATCH 1/2] Update gitmodules to point to dotty-library2.12 --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index f5ea01ebbaab..09e096a43aef 100644 --- a/.gitmodules +++ b/.gitmodules @@ -5,7 +5,7 @@ [submodule "scala2-library"] path = scala2-library url = https://github.com/lampepfl/scala.git - branch = dotty-library + branch = dotty-library2.12 [submodule "collection-strawman"] path = collection-strawman url = https://github.com/scala/collection-strawman.git From f6668f970a0bfc3d56b369b2dcf684d3f41d7791 Mon Sep 17 00:00:00 2001 From: Olivier Blanvillain Date: Mon, 4 Dec 2017 17:15:00 +0100 Subject: [PATCH 2/2] Update scala2-library after lampepfl/scala/pull/31 --- scala2-library | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scala2-library b/scala2-library index 1497d54101b9..233365ae3c92 160000 --- a/scala2-library +++ b/scala2-library @@ -1 +1 @@ -Subproject commit 1497d54101b918e16f2a43fc769ddabdccf61a00 +Subproject commit 233365ae3c92bda840b8c437dc49f03d37de9993