# HG changeset patch
# User andrewm
# Date 1415890979 -3600
# Node ID 517715b23df0f0be8bdd21b6c5681e91079e9953
# Parent  49f22e1246b20619b59615da5f64b44dd9cbf1e5# Parent  323a4eb9b7c0572d7f09616c40a18ab2d8364e89
merge

diff -r 49f22e1246b2 -r 517715b23df0 .cproject
--- a/.cproject	Thu Nov 13 15:58:08 2014 +0100
+++ b/.cproject	Thu Nov 13 16:02:59 2014 +0100
@@ -82,7 +82,7 @@
 					<sourceEntries>
 						<entry excluding="audio_routines_old.S" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="core"/>
 						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="include"/>
-						<entry excluding="basic_analog_output|basic_sensor|d-box|audio_in_FFT|filter_IIR|filter_FIR|samples|oscillator_bank|basic" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="projects"/>
+						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="projects/tank_wars"/>
 					</sourceEntries>
 				</configuration>
 			</storageModule>
@@ -156,7 +156,7 @@
 					<sourceEntries>
 						<entry excluding="audio_routines_old.S" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="core"/>
 						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="include"/>
-						<entry excluding="basic_analog_output|basic_sensor|d-box|audio_in_FFT|filter_IIR|filter_FIR|samples|oscillator_bank|basic" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="projects"/>
+						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="projects/tank_wars"/>
 					</sourceEntries>
 				</configuration>
 			</storageModule>
diff -r 49f22e1246b2 -r 517715b23df0 projects/filter_FIR/main.cpp
--- a/projects/filter_FIR/main.cpp	Thu Nov 13 15:58:08 2014 +0100
+++ b/projects/filter_FIR/main.cpp	Thu Nov 13 16:02:59 2014 +0100
@@ -128,7 +128,7 @@
 	}
 
 	if(fileName.empty()){
-		fileName = "longsample.wav";
+		fileName = "filter/longsample.wav";
 	}
 
 	if(settings.verbose) {
diff -r 49f22e1246b2 -r 517715b23df0 projects/filter_IIR/main.cpp
--- a/projects/filter_IIR/main.cpp	Thu Nov 13 15:58:08 2014 +0100
+++ b/projects/filter_IIR/main.cpp	Thu Nov 13 16:02:59 2014 +0100
@@ -134,7 +134,7 @@
 	}
 
 	if(fileName.empty()){
-		fileName = "longsample.wav";
+		fileName = "filter/longsample.wav";
 	}
 
 	if(settings.verbose) {
diff -r 49f22e1246b2 -r 517715b23df0 projects/samples/main.cpp
--- a/projects/samples/main.cpp	Thu Nov 13 15:58:08 2014 +0100
+++ b/projects/samples/main.cpp	Thu Nov 13 16:02:59 2014 +0100
@@ -128,7 +128,7 @@
 	}
 
 	if(fileName.empty()){
-		fileName = "sample.wav";
+		fileName = "samples/sample.wav";
 	}
 
 	if(settings.verbose) {