Merge branch 'master' of https://github.com/open-ephys/GUI

Builds/VisualStudio2010/open-ephys.sln

+Microsoft Visual Studio Solution File, Format Version 11.00
+Project("{8FA1AFF1-2558-DDD8-66E3-3288408D9CDF}") = "open-ephys", "open-ephys.vcxproj", "{92D8FACB-6E9B-1810-EC14-AD5A7FE1CD78}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Release|Win32 = Release|Win32
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{92D8FACB-6E9B-1810-EC14-AD5A7FE1CD78}.Debug|Win32.ActiveCfg = Debug|Win32
+		{92D8FACB-6E9B-1810-EC14-AD5A7FE1CD78}.Debug|Win32.Build.0 = Debug|Win32
+		{92D8FACB-6E9B-1810-EC14-AD5A7FE1CD78}.Release|Win32.ActiveCfg = Release|Win32
+		{92D8FACB-6E9B-1810-EC14-AD5A7FE1CD78}.Release|Win32.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal

Source/Processors/RecordNode.h

@@ -119,11 +119,6 @@ private:
   */
   File rootFolder;
 
-  /** Determines whether a new rootFolder is created when recording
-      begins. 
-  */
-  bool newDataFolder;
-
   /** Holds data that has been converted from float to int16 before
       saving. 
   */

Source/Processors/SourceNode.cpp

@@ -315,8 +315,6 @@ void SourceNode::process(AudioSampleBuffer &buffer,
 	 	}
 	 }
 
-	 
-
 }