Index: Application/Riskeer/src/Application.Riskeer.Setup/CalculationConfiguration.wxs
===================================================================
diff -u -r41f08bb9839480b3fef23e06bfc8599a1c1f4198 -r8c295e34e4da61cd50cc7380fbaac53f8d8b1ce9
--- Application/Riskeer/src/Application.Riskeer.Setup/CalculationConfiguration.wxs (.../CalculationConfiguration.wxs) (revision 41f08bb9839480b3fef23e06bfc8599a1c1f4198)
+++ Application/Riskeer/src/Application.Riskeer.Setup/CalculationConfiguration.wxs (.../CalculationConfiguration.wxs) (revision 8c295e34e4da61cd50cc7380fbaac53f8d8b1ce9)
@@ -71,9 +71,6 @@
-
-
-
@@ -107,7 +104,6 @@
-
Index: Riskeer/Revetment/src/Riskeer.Revetment.IO/Properties/Resources.Designer.cs
===================================================================
diff -u -rc9b4a3ec9e844bd5d0cd9841f2c8eba7734b1e0e -r8c295e34e4da61cd50cc7380fbaac53f8d8b1ce9
--- Riskeer/Revetment/src/Riskeer.Revetment.IO/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision c9b4a3ec9e844bd5d0cd9841f2c8eba7734b1e0e)
+++ Riskeer/Revetment/src/Riskeer.Revetment.IO/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 8c295e34e4da61cd50cc7380fbaac53f8d8b1ce9)
@@ -159,9 +159,9 @@
///but WITHOUT ANY WARRANTY; without even the implied warranty of
///ME [rest of string was truncated]";.
///
- public static string BekledingenConfiguratieSchema {
+ public static string BekledingenConfiguratieSchema_0 {
get {
- return ResourceManager.GetString("BekledingenConfiguratieSchema", resourceCulture);
+ return ResourceManager.GetString("BekledingenConfiguratieSchema_0", resourceCulture);
}
}
@@ -180,9 +180,9 @@
///but WITHOUT ANY WARRANTY; without even the implied warranty of
///ME [rest of string was truncated]";.
///
- public static string BekledingenConfiguratieSchema_0 {
+ public static string BekledingenConfiguratieSchema_1 {
get {
- return ResourceManager.GetString("BekledingenConfiguratieSchema_0", resourceCulture);
+ return ResourceManager.GetString("BekledingenConfiguratieSchema_1", resourceCulture);
}
}
Index: Riskeer/Revetment/src/Riskeer.Revetment.IO/Properties/Resources.resx
===================================================================
diff -u -rc9b4a3ec9e844bd5d0cd9841f2c8eba7734b1e0e -r8c295e34e4da61cd50cc7380fbaac53f8d8b1ce9
--- Riskeer/Revetment/src/Riskeer.Revetment.IO/Properties/Resources.resx (.../Resources.resx) (revision c9b4a3ec9e844bd5d0cd9841f2c8eba7734b1e0e)
+++ Riskeer/Revetment/src/Riskeer.Revetment.IO/Properties/Resources.resx (.../Resources.resx) (revision 8c295e34e4da61cd50cc7380fbaac53f8d8b1ce9)
@@ -157,8 +157,8 @@
ondergrens van de waterstanden
-
- ..\resources\BekledingenConfiguratieSchema.xsd;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8
+
+ ..\resources\BekledingenConfiguratieSchema_1.xsd;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8
Gras (golfklap)
Fisheye: Tag 8c295e34e4da61cd50cc7380fbaac53f8d8b1ce9 refers to a dead (removed) revision in file `Riskeer/Revetment/src/Riskeer.Revetment.IO/Resources/BekledingenConfiguratieSchema.xsd'.
Fisheye: No comparison available. Pass `N' to diff?
Index: Riskeer/Revetment/src/Riskeer.Revetment.IO/Resources/BekledingenConfiguratieSchema_1.xsd
===================================================================
diff -u
--- Riskeer/Revetment/src/Riskeer.Revetment.IO/Resources/BekledingenConfiguratieSchema_1.xsd (revision 0)
+++ Riskeer/Revetment/src/Riskeer.Revetment.IO/Resources/BekledingenConfiguratieSchema_1.xsd (revision 8c295e34e4da61cd50cc7380fbaac53f8d8b1ce9)
@@ -0,0 +1,40 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
Index: Riskeer/Revetment/src/Riskeer.Revetment.IO/Riskeer.Revetment.IO.csproj
===================================================================
diff -u -rc9b4a3ec9e844bd5d0cd9841f2c8eba7734b1e0e -r8c295e34e4da61cd50cc7380fbaac53f8d8b1ce9
--- Riskeer/Revetment/src/Riskeer.Revetment.IO/Riskeer.Revetment.IO.csproj (.../Riskeer.Revetment.IO.csproj) (revision c9b4a3ec9e844bd5d0cd9841f2c8eba7734b1e0e)
+++ Riskeer/Revetment/src/Riskeer.Revetment.IO/Riskeer.Revetment.IO.csproj (.../Riskeer.Revetment.IO.csproj) (revision 8c295e34e4da61cd50cc7380fbaac53f8d8b1ce9)
@@ -13,7 +13,7 @@
Designer
-
+
Designer
Index: Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.IO/Configurations/WaveImpactAsphaltCoverWaveConditionsCalculationConfigurationReader.cs
===================================================================
diff -u -r699d925f01e1d0ed1f634b2b4b6c24af1daa306c -r8c295e34e4da61cd50cc7380fbaac53f8d8b1ce9
--- Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.IO/Configurations/WaveImpactAsphaltCoverWaveConditionsCalculationConfigurationReader.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationConfigurationReader.cs) (revision 699d925f01e1d0ed1f634b2b4b6c24af1daa306c)
+++ Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.IO/Configurations/WaveImpactAsphaltCoverWaveConditionsCalculationConfigurationReader.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationConfigurationReader.cs) (revision 8c295e34e4da61cd50cc7380fbaac53f8d8b1ce9)
@@ -51,7 +51,7 @@
: base(xmlFilePath, new[]
{
Resources.BekledingenConfiguratieSchema_0,
- Resources.BekledingenConfiguratieSchema
+ Resources.BekledingenConfiguratieSchema_1
}) {}
protected override WaveConditionsCalculationConfiguration ParseCalculationElement(XElement calculationElement)