Merge branch 'master' into develop

# Conflicts: # template_colormodel/CM120312.mat
TASBE · Nov 17, 2017 · b5f795e · b5f795e
2 parents b3926df + e3a57a5
commit b5f795e
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 3 deletions.
diff --git a/template_analysis/batch_template.m b/template_analysis/batch_template.m
@@ -19,7 +19,7 @@
 AP=setPemDropThreshold(AP,5');
 % Add autofluorescence back in after removing for compensation?
 AP=setUseAutoFluorescence(AP,false');
-% By default, analysis tries to fit constitutive to transformed and non-transformed components
+% By default, analysis tries to fit constitutive to transformed and non-transformed components
 % If your distribution is more complex or less complex, you can change the number of components
 % AP=setNumGaussianComponents(AP,3);
 

diff --git a/template_analysis/plusminus_template.m b/template_analysis/plusminus_template.m
@@ -23,7 +23,7 @@
 AP=setPemDropThreshold(AP,5');
 % Add autofluorescence back in after removing for compensation?
 AP=setUseAutoFluorescence(AP,false');
-% By default, analysis tries to fit constitutive to “transformed” and “non-transformed” components
+% By default, analysis tries to fit constitutive to transformed and non-transformed components
 % If your distribution is more complex or less complex, you can change the number of components
 % AP=setNumGaussianComponents(AP,3);
 

diff --git a/template_analysis/transfercurve_template.m b/template_analysis/transfercurve_template.m
@@ -25,7 +25,7 @@
 AP=setPemDropThreshold(AP,5');
 % Add autofluorescence back in after removing for compensation?
 AP=setUseAutoFluorescence(AP,false');
-% By default, analysis tries to fit constitutive to “transformed” and “non-transformed” components
+% By default, analysis tries to fit constitutive to transformed and non-transformed components
 % If your distribution is more complex or less complex, you can change the number of components
 % AP=setNumGaussianComponents(AP,3);
 

diff --git a/template_colormodel/CM120312.mat b/template_colormodel/CM120312.mat