merge back ml2 into trunk

svn path=/trunk/mono/; revision=100555

diff --git a/mono/metadata/ChangeLog b/mono/metadata/ChangeLog
index 7c6e3cd322521b5a405cede9eb8efbe851d4bdc7..e76afaff4298fb5df90f94ce1b7f2676fa66cc38 100644 (file)
--- a/mono/metadata/ChangeLog
+++ b/mono/metadata/ChangeLog
@@ -1,3 +1,8 @@
+2008-04-13  Jb Evain  <jbevain@novell.com>
+
+       * domain.c: update the 2.1 profile versions.
+       Merged from the Moonlight 2 branch.
+
 2008-04-12  Zoltan Varga  <vargaz@gmail.com>
 
        * assembly.c (mono_assembly_load_from_full): Do the check for loading other

diff --git a/mono/metadata/domain.c b/mono/metadata/domain.c
index f142b04b3279c6dad1d0c5965376eba7e49ccd1a..c2ab6697fb6ec6c7c7fc0f1e9709cf4f0bf3114c 100644 (file)
--- a/mono/metadata/domain.c
+++ b/mono/metadata/domain.c
@@ -112,7 +112,7 @@ static const MonoRuntimeInfo supported_runtimes[] = {
        {"v1.1.4322", "1.0", { {1,0,5000,0}, {7,0,5000,0} }     },
        {"v2.0.50215","2.0", { {2,0,0,0},    {8,0,0,0} }        },
        {"v2.0.50727","2.0", { {2,0,0,0},    {8,0,0,0} }        },
-       {"moonlight", "2.1", { {2,1,0,0},    {9,0,0,0} }    },
+       {"moonlight", "2.1", { {2,0,5,0},    {9,0,0,0} }    },
 };