Merging with Jaap De Haan.

project/CommonAssemblyInfo.cs

@@ -1,19 +1,19 @@
-using System.Reflection;
-
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.239
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-[assembly: AssemblyCompanyAttribute("ThoughtWorks Inc.")]
-[assembly: AssemblyProductAttribute("CruiseControl.NET")]
-[assembly: AssemblyCopyrightAttribute("Copyright © 2003 - 2011 ThoughtWorks Inc.")]
-[assembly: AssemblyTrademarkAttribute("")]
-[assembly: AssemblyVersionAttribute("0.0.0.0")]
-[assembly: AssemblyFileVersionAttribute("0.0.0.0")]
-
+using System.Reflection;
+
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.239
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+[assembly: AssemblyCompanyAttribute("ThoughtWorks Inc.")]
+[assembly: AssemblyProductAttribute("CruiseControl.NET")]
+[assembly: AssemblyCopyrightAttribute("Copyright © 2003 - 2012 ThoughtWorks Inc.")]
+[assembly: AssemblyTrademarkAttribute("")]
+[assembly: AssemblyVersionAttribute("0.0.0.0")]
+[assembly: AssemblyFileVersionAttribute("0.0.0.0")]
+

project/Remote/QueueSetSnapshot.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Xml.Serialization;
 using System.Collections.Generic;
 using System.Runtime.Serialization;
@@ -14,8 +14,6 @@ namespace ThoughtWorks.CruiseControl.Remote
 	public class QueueSetSnapshot
 	{
         private List<QueueSnapshot> snapshots = new List<QueueSnapshot>();
-        // Required for 1.4.4 or earlier compatibility
-        private QueueSnapshotList queueSnapshots = null;
 
 		/// <summary>
 		/// Initializes a new instance of the <see cref="QueueSetSnapshot"/> class.

project/Remote/QueueSnapshot.cs

@@ -1,4 +1,4 @@
-
+
 using System;
 using System.Xml.Serialization;
 using System.Collections.Generic;
@@ -15,8 +15,6 @@ public class QueueSnapshot
 	{
 		private string queueName;
         private List<QueuedRequestSnapshot> queueRequests = new List<QueuedRequestSnapshot>();
-        // Required for 1.4.4 or earlier compatibility
-        private QueuedRequestSnapshotList _requests;
 
         /// <summary>
         /// Initialise a new blank <see cref="QueueSnapshot"/>.