Merge pull request #1857 from slluis/fix-assembly-resolver

[mono.git] / .gitmodules

diff --git a/.gitmodules b/.gitmodules
index e8c29dd0a0baab67e7f8316361cc5c64929ac5bf..858838fc78f6b5a52e6602e3ee0fcf4723143f93 100644 (file)
--- a/.gitmodules
+++ b/.gitmodules
@@ -10,12 +10,10 @@
 [submodule "external/debian-snapshot"]
        path = external/debian-snapshot
        url = git://github.com/directhex/mono-snapshot.git
-[submodule "external/entityframework"]
-       path = external/entityframework
-       url = git://github.com/mono/entityframework.git
 [submodule "external/rx"]
        path = external/rx
        url = git://github.com/mono/rx.git
+       branch = rx-oss-v2.2
 [submodule "external/ikvm"]
        path = external/ikvm
        url = git://github.com/mono/ikvm-fork.git
@@ -28,6 +26,7 @@
 [submodule "external/referencesource"]
        path = external/referencesource
        url = git://github.com/mono/referencesource
+       branch = mono
 [submodule "external/reference-assemblies"]
-       path = external/reference-assemblies
+       path = external/binary-reference-assemblies
        url = git://github.com/mono/reference-assemblies.git