# This is a combination of 8 commits.

# This is the 1st commit message:

9 update cpp build settings and gtest compatability

# This is the commit message google#2:

Revert back to test suite when using a more uptodate version of gtest than supplied by apt-get

# This is the commit message google#3:

actually version 1.8

# This is the commit message google#4:

scons instructions update

# This is the commit message google#5:

google#5 Now matlab scripts run correctly with modern matlab

# This is the commit message google#6:

Update SConstruct to be python 3 compatible.
# This is the commit message google#7:

revert matlab-related changes

# This is the commit message google#8:

whitespace

matlab/CARFAC_SAI_hacking.m

@@ -69,4 +69,3 @@
 %%
 system('rm -r frames');
 
-