merge with master

2019-12-02 19:36:54 -08:00
parent 39885668ae
commit 73d6a32add
247 changed files with 27860 additions and 8218 deletions
--- a/src/Calculator/Views/GraphingCalculator/KeyGraphFeaturesPanel.xaml.h
+++ b/src/Calculator/Views/GraphingCalculator/KeyGraphFeaturesPanel.xaml.h
@@ -7,6 +7,7 @@
 #include "CalcViewModel\GraphingCalculator\EquationViewModel.h"
 #include "Controls/MathRichEditBox.h"
 #include "Controls/EquationTextBox.h"
+#include "TemplateSelectors/KeyGraphFeaturesTemplateSelector.h"

 namespace CalculatorApp
 {