Merge master into feature/GraphingCalculator branch (#660)

2019-09-05 15:01:12 -07:00
parent 1c9755d38a
commit 41fbcfe9c5
199 changed files with 5809 additions and 2925 deletions
--- a/src/Calculator/Views/CalculatorProgrammerRadixOperators.xaml
+++ b/src/Calculator/Views/CalculatorProgrammerRadixOperators.xaml
@@ -216,7 +216,7 @@
                      FontSize="16"
                      AutomationProperties.AutomationId="shiftButton"
                      Checked="Shift_Clicked"
-                      Content="&#xE752;"
+                      Content="&#xF897;"
                      Unchecked="Shift_Clicked"/>
        <controls:CalculatorButton x:Name="ModButton"
                                   x:Uid="modButton"
@@ -430,6 +430,6 @@
                                   FontSize="12"
                                   AutomationProperties.AutomationId="negateButton"
                                   ButtonId="Negate"
-                                   Content="&#xE94D;"/>
+                                   Content="&#xF898;"/>
    </Grid>
 </UserControl>