Merged master fixed conflict.

.gitignore

@@ -45,6 +45,20 @@ Builds/VisualStudio2012/open-ephys.vcxproj.user
 Builds/VisualStudio2012/windowState.xml
 Builds/VisualStudio2012/pipetest.bit
 
+Builds/VisualStudio2013/Debug
+Builds/VisualStudio2013/Release
+Builds/VisualStudio2013/Debug64
+Builds/VisualStudio2013/Release64
+Builds/VisualStudio2013/x64
+Builds/VisualStudio2013/ipch
+Builds/VisualStudio2013/open-ephys.sdf
+Builds/VisualStudio2013/open-ephys.opensdf
+Builds/VisualStudio2013/open-ephys.suo
+Builds/VisualStudio2013/open-ephys.v11.suo
+Builds/VisualStudio2013/open-ephys.vcxproj.user
+Builds/VisualStudio2013/windowState.xml
+Builds/VisualStudio2013/pipetest.bit
+
 Builds/VisualStudio2010/Debug
 Builds/VisualStudio2010/Release
 Builds/VisualStudio2010/ipch

Builds/MacOSX/Info.plist

@@ -16,9 +16,9 @@
     <key>CFBundleSignature</key>
     <string>????</string>
     <key>CFBundleShortVersionString</key>
-    <string>0.3.1</string>
+    <string>0.3.2</string>
     <key>CFBundleVersion</key>
-    <string>0.3.1</string>
+    <string>0.3.2</string>
     <key>NSHumanReadableCopyright</key>
     <string>Open Ephys</string>
     <key>NSHighResolutionCapable</key>

Builds/VisualStudio2012/resources.rc

@@ -7,7 +7,7 @@
 #include <windows.h>
 
 VS_VERSION_INFO VERSIONINFO
-FILEVERSION  0,3,1,0
+FILEVERSION  0,3,2,0
 BEGIN
   BLOCK "StringFileInfo"
   BEGIN
@@ -15,9 +15,9 @@ BEGIN
     BEGIN
       VALUE "CompanyName",  "Open Ephys\0"
       VALUE "FileDescription",  "open-ephys\0"
-      VALUE "FileVersion",  "0.3.1\0"
+      VALUE "FileVersion",  "0.3.2\0"
       VALUE "ProductName",  "open-ephys\0"
-      VALUE "ProductVersion",  "0.3.1\0"
+      VALUE "ProductVersion",  "0.3.2\0"
     END
   END
 

Builds/VisualStudio2013/copydlls.cmd

+@echo off
+echo copy %2\okFrontPanel.dll %3
+copy %2\okFrontPanel.dll %3
+echo copy %1\hdf5.dll %3
+copy %1\hdf5.dll %3
+echo copy %1\hdf5_cpp.dll %3
+copy %1\hdf5_cpp.dll %3
+rem copy %1\szip.dll %3
+rem copy %1\zlib.dll %3
+
+
+
+echo copy ..\..\Resources\DLLs\Win64\okFrontPanel.dll .\Debug64\bin
\ No newline at end of file

Builds/VisualStudio2013/open-ephys.sln

+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2013
+Project("{5A05F353-1D63-394C-DFB0-981BB2309002}") = "open-ephys", "open-ephys.vcxproj", "{9C924D66-7DEC-1AEF-B375-DB8666BFB909}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Release|Win32 = Release|Win32
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{9C924D66-7DEC-1AEF-B375-DB8666BFB909}.Debug|Win32.ActiveCfg = Debug|Win32
+		{9C924D66-7DEC-1AEF-B375-DB8666BFB909}.Debug|Win32.Build.0 = Debug|Win32
+		{9C924D66-7DEC-1AEF-B375-DB8666BFB909}.Release|Win32.ActiveCfg = Release|Win32
+		{9C924D66-7DEC-1AEF-B375-DB8666BFB909}.Release|Win32.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal

Builds/VisualStudio2013/resources.rc

+#ifdef JUCE_USER_DEFINED_RC_FILE
+ #include JUCE_USER_DEFINED_RC_FILE
+#else
+
+#undef  WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+
+VS_VERSION_INFO VERSIONINFO
+FILEVERSION  0,3,2,0
+BEGIN
+  BLOCK "StringFileInfo"
+  BEGIN
+    BLOCK "040904E4"
+    BEGIN
+      VALUE "CompanyName",  "Open Ephys\0"
+      VALUE "FileDescription",  "open-ephys\0"
+      VALUE "FileVersion",  "0.3.2\0"
+      VALUE "ProductName",  "open-ephys\0"
+      VALUE "ProductVersion",  "0.3.2\0"
+    END
+  END
+
+  BLOCK "VarFileInfo"
+  BEGIN
+    VALUE "Translation", 0x409, 65001
+  END
+END
+
+#endif

JuceLibraryCode/BinaryData.h

@@ -4,6 +4,9 @@
 
 */
 
+#ifndef BINARYDATA_H_21121582_INCLUDED
+#define BINARYDATA_H_21121582_INCLUDED
+
 namespace BinaryData
 {
     extern const char*   cpmonoblackserialized;
@@ -189,10 +192,15 @@ namespace BinaryData
     extern const char*   PipelineB02_png;
     const int            PipelineB02_pngSize = 5390;
 
-    extern const char*   FPGAOutputEditor_cpp;
-    const int            FPGAOutputEditor_cppSize = 2213;
+    // Points to the start of a list of resource names.
+    extern const char* namedResourceList[];
+
+    // Number of elements in the namedResourceList array.
+    const int namedResourceListSize = 61;
 
     // If you provide the name of one of the binary resource variables above, this function will
     // return the corresponding data and its size (or a null pointer if the name isn't found).
     const char* getNamedResource (const char* resourceNameUTF8, int& dataSizeInBytes) throw();
 }
+
+#endif

JuceLibraryCode/JuceHeader.h

@@ -39,8 +39,8 @@
 namespace ProjectInfo
 {
     const char* const  projectName    = "open-ephys";
-    const char* const  versionString  = "0.3.1";
-    const int          versionNumber  = 0x301;
+    const char* const  versionString  = "0.3.2";
+    const int          versionNumber  = 0x302;
 }
 
 #endif   // __APPHEADERFILE_YNSYIRR__