mirror of
https://github.com/Microsoft/calculator.git
synced 2025-08-21 13:53:11 -07:00
Commit graph
Select branches
Hide pull requests
add-internal-ci
fabricbot-configuration-migration
feature/UICSharpCalculator
feature/csvm
feature/viewmodel-csharp
feature/winui2.6
main
mcooley-lochandoff2023-06-09
mcooley/rename-main-branch
mcooley/ui-tests-on-win11
onboarding-prIssueManagement
qualtimi/AeroUpdate
release/1902
release/1903
release/1904
release/1905
release/1906
release/2005
release/2007
release/2008
release/2009
release/2010
release/2011
release/2012
release/2101
release/2102
release/2103
release/2109
release/2109-1
release/2110
release/2112
release/2201
release/2203
release/2204
release/2205
release/2206
release/2207
release/2208
release/2209
release/2210
release/2304
release/2307
release/2312
release/2401
release/2403
release/2405
release/2409
release/2411
release/2501
release/2502
revert-1337-CompilerFlag
u/tilia/ci
u/tilia/relstage
u/tilia/render
u/zhangh/cp
u/zhangh/test-ut
users/merlinbot/1es-pt-auto-baselining-pr
volkcor/UpdateMain2407
volkcor/UpdateMain2503
volkcor/UpdateMain2506
volkcor/UpdateMainto2410
volkcor/UpdateMainto2412
#1
#10
#100
#101
#1010
#1012
#1014
#1016
#1021
#1022
#1023
#1024
#1026
#1027
#1028
#1032
#1036
#1037
#1038
#1039
#104
#1041
#1042
#1046
#1047
#1049
#1051
#1054
#1055
#1056
#1057
#1058
#1059
#106
#1060
#1061
#1062
#1064
#1065
#1067
#1073
#1074
#1075
#1076
#1078
#1079
#1081
#1082
#1084
#1085
#1086
#1087
#1088
#1089
#1090
#1091
#1092
#1093
#1094
#1096
#1097
#1098
#1099
#11
#110
#1100
#1105
#1106
#1107
#1108
#1109
#1113
#1114
#1115
#1116
#1117
#1120
#1121
#1133
#1134
#1136
#1141
#1142
#1145
#1146
#1147
#1148
#1149
#1152
#1154
#1155
#1156
#1157
#1159
#1161
#1162
#1163
#1166
#1167
#118
#1183
#1195
#1196
#1197
#1199
#12
#1201
#1202
#1203
#1206
#1208
#1209
#121
#1210
#1211
#1213
#1214
#1215
#1217
#1219
#1220
#1221
#1223
#1224
#1225
#1226
#1227
#1228
#1229
#1230
#1231
#1233
#1234
#1235
#1236
#1239
#124
#1242
#1243
#1247
#1249
#125
#1250
#1253
#1254
#1256
#1257
#1258
#1259
#126
#1260
#1261
#1262
#1263
#1264
#1265
#1266
#1270
#1271
#1272
#1273
#1285
#1286
#1289
#129
#13
#1300
#1302
#1306
#1307
#1309
#131
#1312
#1313
#1315
#1316
#1317
#132
#1321
#1322
#1324
#1329
#1330
#1332
#1333
#1334
#1336
#1337
#1338
#134
#1342
#1343
#1344
#1346
#1347
#1348
#135
#1353
#1354
#1356
#1357
#1358
#1359
#136
#1362
#1363
#1364
#1365
#137
#1370
#1373
#1374
#1375
#1376
#1393
#1394
#1395
#14
#1400
#1401
#1402
#1403
#1408
#1410
#1411
#1412
#1413
#1415
#1416
#1419
#1421
#1422
#1423
#1424
#1426
#1427
#1428
#1429
#1430
#1431
#1432
#1434
#1439
#144
#1442
#1444
#1445
#1447
#1448
#1449
#145
#1452
#1452
#1453
#1455
#1457
#1458
#1459
#146
#1465
#1466
#1467
#1468
#1469
#1470
#1471
#1478
#1482
#1483
#1484
#1485
#1486
#1487
#1488
#15
#1504
#1505
#151
#1510
#1511
#1512
#1513
#1516
#1517
#1518
#1521
#1523
#1525
#1529
#1531
#1536
#1538
#1539
#1542
#1544
#1546
#1547
#1549
#1550
#1551
#1552
#1553
#1556
#1558
#1559
#156
#1561
#1563
#1564
#1565
#1566
#1567
#1570
#1571
#1572
#1573
#1574
#1575
#1576
#1578
#1579
#158
#1580
#1582
#1585
#1586
#1589
#159
#1591
#1595
#1596
#1597
#1598
#1599
#16
#160
#1602
#1605
#1608
#1610
#1613
#1615
#1616
#1618
#1619
#1620
#1621
#1622
#1623
#1626
#1628
#1631
#1632
#1633
#1635
#1638
#1641
#1642
#1643
#165
#1653
#1654
#1655
#1656
#1657
#1659
#166
#1660
#1661
#1662
#1663
#1677
#1679
#1680
#1682
#1683
#1684
#1686
#1687
#1689
#1692
#1698
#1699
#17
#1700
#1701
#1702
#1703
#1704
#1705
#1706
#1707
#1708
#1709
#171
#1710
#1711
#1715
#1717
#1718
#1720
#1721
#1722
#1727
#1728
#1729
#1733
#1737
#1738
#1741
#1743
#1745
#1746
#1750
#1754
#176
#1760
#1761
#1762
#1766
#1768
#1770
#1771
#1773
#1778
#1781
#1783
#1784
#1785
#1786
#1787
#1791
#1793
#1794
#1795
#1797
#1798
#1799
#18
#1800
#1801
#1802
#1803
#1805
#1811
#1812
#1815
#1818
#1819
#182
#1820
#1821
#1824
#1826
#1828
#183
#1830
#1833
#1834
#1835
#1836
#1837
#1838
#1839
#184
#1842
#1843
#1844
#1845
#1846
#1846
#1847
#1847
#1848
#1849
#185
#1854
#1855
#1856
#1857
#186
#1864
#1866
#1867
#1868
#1869
#187
#1870
#1871
#1872
#1874
#1875
#188
#1880
#1881
#1882
#1882
#1883
#1884
#1885
#1886
#1887
#1888
#1889
#189
#1891
#1892
#1893
#1895
#1896
#1896
#1897
#1898
#1899
#19
#190
#1900
#1901
#1902
#1903
#1904
#1905
#1907
#1908
#1909
#1910
#1911
#1912
#1913
#1914
#1915
#1916
#1916
#1917
#1918
#1919
#192
#1920
#1921
#1922
#1923
#1923
#1924
#1925
#1926
#1927
#1928
#1929
#193
#1930
#1933
#1934
#194
#1940
#1942
#1943
#1944
#1945
#1946
#195
#1950
#1952
#1953
#1954
#1955
#1957
#196
#1960
#1961
#1961
#1964
#1965
#197
#1972
#1973
#198
#1982
#1984
#1985
#1989
#1989
#199
#1990
#1995
#1999
#2
#20
#200
#2003
#2006
#2007
#201
#2013
#2015
#2027
#2028
#2028
#2029
#203
#2031
#2032
#2033
#2033
#2034
#2035
#2035
#2038
#2039
#2041
#2042
#2043
#2049
#205
#2050
#2056
#2058
#2059
#2060
#2061
#2062
#2063
#2064
#2064
#2065
#2068
#2069
#2069
#2071
#2074
#2074
#2078
#2079
#208
#2080
#2081
#2085
#2086
#2087
#2088
#2089
#2091
#2093
#2093
#2094
#2095
#2098
#21
#210
#2101
#2103
#2104
#2106
#2107
#2109
#211
#2110
#2115
#2116
#2117
#212
#2121
#2121
#2125
#2126
#213
#2131
#2133
#2137
#2140
#2147
#2149
#2151
#2152
#2154
#2156
#2157
#216
#2161
#2163
#2165
#2166
#2167
#2168
#217
#2170
#2172
#2174
#2176
#2177
#2179
#218
#2180
#2181
#2183
#2185
#2187
#2188
#2189
#219
#2192
#2195
#2196
#22
#220
#2202
#2204
#2206
#2207
#2207
#2208
#2213
#2216
#2218
#2219
#2226
#2229
#2230
#2231
#2235
#2236
#2238
#2238
#2240
#2240
#2241
#2245
#2246
#2247
#2249
#225
#2250
#2251
#2256
#2257
#2258
#2259
#2261
#2262
#2263
#2263
#2264
#2265
#2266
#2267
#2268
#2270
#2277
#2277
#2278
#2278
#2279
#228
#2280
#2281
#2282
#2285
#2286
#2287
#2289
#229
#2293
#2294
#2295
#2296
#2297
#2298
#23
#230
#2300
#2301
#2302
#2303
#2305
#2306
#2307
#2308
#2308
#2309
#231
#2310
#2314
#2319
#2319
#2322
#2323
#2324
#2327
#233
#2332
#2332
#2333
#2334
#2336
#2338
#2339
#234
#2340
#2342
#2347
#235
#2350
#2351
#2352
#2353
#2354
#2355
#2355
#236
#2366
#2366
#2367
#2367
#2369
#2369
#2372
#2373
#239
#241
#242
#244
#246
#247
#249
#25
#253
#256
#257
#259
#26
#263
#269
#27
#270
#273
#276
#279
#284
#286
#287
#289
#29
#290
#296
#297
#298
#3
#30
#300
#304
#306
#31
#314
#315
#317
#32
#320
#321
#323
#327
#329
#33
#330
#331
#332
#334
#337
#339
#34
#341
#342
#345
#346
#35
#353
#354
#355
#356
#357
#359
#36
#360
#361
#363
#365
#366
#368
#369
#37
#371
#373
#374
#375
#376
#38
#381
#39
#390
#391
#392
#394
#396
#398
#399
#4
#40
#400
#403
#405
#406
#41
#410
#411
#412
#422
#423
#430
#431
#432
#433
#434
#436
#438
#440
#442
#443
#444
#446
#447
#448
#449
#450
#451
#456
#457
#458
#464
#465
#466
#467
#469
#470
#472
#473
#474
#477
#479
#480
#481
#484
#488
#489
#491
#492
#494
#496
#498
#499
#5
#500
#501
#502
#503
#506
#507
#509
#510
#513
#516
#518
#521
#522
#523
#524
#531
#532
#534
#535
#536
#537
#540
#542
#544
#545
#546
#547
#548
#549
#550
#551
#553
#555
#556
#558
#561
#564
#565
#566
#567
#568
#569
#570
#572
#575
#576
#577
#578
#579
#580
#581
#584
#585
#586
#588
#590
#593
#597
#599
#6
#600
#601
#603
#606
#612
#615
#617
#619
#622
#623
#624
#626
#627
#628
#632
#633
#634
#635
#636
#637
#638
#639
#640
#641
#644
#645
#646
#647
#649
#652
#657
#658
#660
#661
#662
#668
#669
#671
#672
#675
#676
#679
#680
#681
#682
#685
#686
#687
#688
#689
#692
#694
#695
#696
#697
#698
#7
#700
#701
#702
#703
#704
#705
#706
#708
#709
#710
#711
#712
#713
#714
#715
#716
#720
#722
#723
#724
#727
#728
#733
#734
#736
#738
#739
#740
#743
#745
#746
#748
#750
#752
#754
#755
#756
#758
#760
#762
#764
#766
#767
#768
#769
#772
#773
#776
#778
#779
#781
#782
#784
#785
#786
#787
#788
#790
#791
#793
#794
#797
#799
#8
#802
#803
#804
#805
#808
#81
#810
#812
#813
#814
#815
#816
#819
#82
#821
#822
#823
#825
#826
#827
#829
#830
#831
#832
#833
#834
#836
#837
#838
#839
#84
#840
#841
#842
#843
#844
#845
#846
#847
#848
#85
#850
#852
#853
#854
#855
#856
#858
#859
#86
#861
#862
#863
#864
#865
#866
#867
#868
#869
#875
#877
#878
#879
#88
#881
#882
#884
#885
#886
#890
#895
#896
#897
#898
#899
#9
#900
#902
#903
#904
#907
#908
#909
#91
#910
#912
#914
#915
#916
#917
#918
#92
#920
#921
#922
#923
#924
#925
#926
#927
#928
#929
#93
#930
#931
#932
#934
#936
#938
#94
#940
#95
#958
#96
#967
#968
#97
#971
#972
#974
#99
-
24f3b89337
Fix gcdrat to return correct optimization only
uhliksk
2019-03-14 04:27:03 +01:00 -
770f014bfc
Fix wrong results after pow and sqrt
uhliksk
2019-03-14 04:26:49 +01:00 -
032a7da930
Fix gcdrat to return correct optimization only
uhliksk
2019-03-14 04:09:01 +01:00 -
36c23fba24
Fix wrong results after pow and sqrt
uhliksk
2019-03-14 04:08:26 +01:00 -
ac5292cf88
Optimised images losslessly. (#229)
Guillaume Rischard
2019-03-14 00:37:50 +01:00 -
96e1d950f0
Doubled Code Fix
William
2019-03-13 19:14:08 -04:00 -
0fa7049184
Merge remote-tracking branch 'upstream/master'
William
2019-03-13 19:08:12 -04:00 -
c27f7a0a3c
Move <iterator> include to PCHs
Michał Janiszewski
2019-03-14 00:03:27 +01:00 -
1518c613ff
Replace custom ARRAYSIZE macro with std::size
Michał Janiszewski
2019-03-08 21:17:59 +01:00 -
5a7e982664
Reverted removing the left parenthesis automation name and updated narrator announcement to trigger on OpenParenthesisCount property changed.
Stephanie Anderl
2019-03-13 15:39:57 -07:00 -
6f4ecf35b3
Remove RenderTransform that is never used (#247)
Rudy Huyn
2019-03-13 15:08:51 -07:00 -
0f1d6c29cf
Use the same layout than the existing one while fixing the issue
Rudy Huyn
2019-03-13 14:52:05 -07:00 -
be31288187
Fix declarations of functions (#186)
Michał Janiszewski
2019-03-13 21:15:08 +01:00 -
251578047f
Make 73 numeric constants const, moving them into .rdata (#234)
Jeff Genovy
2019-03-13 13:10:14 -07:00 -
7663c0d5f2
Remove .editorconfig from sln (#290)
Rudy Huyn
2019-03-13 12:50:23 -07:00 -
dca764fb26
Make 73 numeric constants const, moving them into .rdata
Jeff Genovy
2019-03-09 12:24:37 -08:00 -
c38f5694b7
Remove CalcException as requested in review
Michał Janiszewski
2019-03-09 00:30:24 +01:00 -
0d21d65fc6
Move CalcException from header to its only consumer
Michał Janiszewski
2019-03-09 00:16:38 +01:00 -
6a2a441913
Fix declarations of functions
Michał Janiszewski
2019-03-07 22:11:45 +01:00 -
29c362657b
Howard Wolosky
2019-03-13 03:34:06 -07:00 -
409df4e2d3
Remove .editorconfig from sln
Rudy Huyn
2019-03-12 23:31:40 -07:00 -
500f0c4d22
Force en-US for unit tests
Rudy Huyn
2019-03-12 23:22:46 -07:00 -
e6bd36ec2a
Eliminate redundant copies of EMPTY_UNIT object, saving 2.5 KB. (#235)
Jeff Genovy
2019-03-12 19:24:37 -07:00 -
3fb535681b
Fix separators for unit tests
uhliksk
2019-03-13 03:21:12 +01:00 -
47e47837d1
Change to use "inline" instead of "extern __declspec(selectany)".
Jeff Genovy
2019-03-12 18:03:05 -07:00 -
af50df2ec0
Fix wrong results after sqrt
uhliksk
2019-03-09 16:54:25 +01:00 -
7fcf0c2f6e
Remove logging of invalid pasted text
Howard Wolosky
2019-03-12 16:17:46 -07:00 -
000ecdfcca
Removed LeftParenthesisAutomationName bindings in Scientific and Programmer calculator xaml files.
Stephanie Anderl
2019-03-12 15:12:55 -07:00 -
a80d082242
CopyPasteManagerTest fails to test all values (#269)
Rudy Huyn
2019-03-12 14:58:47 -07:00 -
3796201cce
Added narrator announcements when right parenthesis is clicked
Stephanie Anderl
2019-03-12 13:46:45 -07:00 -
cf33f6c1b4
Nikita Potapenko
2019-03-12 14:21:19 +02:00 -
05b55b6ca9
decentralized aluminumhub
2019-03-12 04:55:45 -06:00 -
62aa111518
Kolappan Nathan
2019-03-12 11:58:46 +05:30 -
a3027616b4
Modify ASSERT_POSITIVE_TESTCASES, ASSERT_NEGATIVE_TESTCASES to use iterators
Rudy Huyn
2019-03-11 22:29:43 -07:00 -
70a88d85b6
remove extra spaces
Rudy Huyn
2019-03-11 20:51:50 -07:00 -
b88e621171
fix formatting
Rudy Huyn
2019-03-11 20:51:02 -07:00 -
db781b9026
Add unit tests
Rudy Huyn
2019-03-11 20:47:16 -07:00 -
080e96c557
Fix START_LOOP, ASSERT_NEGATIVE_TESTCASES and ASSERT_POSITIVE_TESTCASES to test all items
Rudy Huyn
2019-03-11 20:14:46 -07:00 -
3654ccd95b
add exponential without sign support
Rudy Huyn
2019-03-11 19:59:35 -07:00 -
67fa2286eb
Remove duplicate .editorconfig. (#257)
Johan Laanstra
2019-03-11 17:04:17 -07:00 -
d3afd93952
Mike Hatch
2019-03-11 12:30:49 -05:00 -
d28eff2c14
ImgBotApp
2019-03-11 07:59:34 +00:00 -
3a02f6e1d4
Use the current locale to sort country names
Rudy Huyn
2019-03-11 00:33:43 -07:00 -
9ad93e0d59
Increase the number of meaningfull digits (2->4)
Rudy Huyn
2019-03-10 23:03:26 -07:00 -
a509eff96e
Johan Laanstra
2019-03-10 22:25:01 -07:00 -
82762d6b7f
Johan Laanstra
2019-03-10 22:23:44 -07:00 -
525e61ce31
nit
Rudy Huyn
2019-03-10 20:05:42 -07:00 -
54d2332cbc
formatting
Rudy Huyn
2019-03-10 20:04:20 -07:00 -
e59a67fa98
Currency rate: Compute how many decimals we need to display two meaningful digits at minimum
Rudy Huyn
2019-03-10 19:48:14 -07:00 -
1fbfceb0a4
take feedback into account
Rudy Huyn
2019-03-10 16:55:55 -07:00 -
9d0010bf48
Revert "refactor: simplified if statements"
Maharramoff
2019-03-11 02:24:17 +04:00 -
6e4d0a8b2c
refactor: simplified if statements
Maharramoff
2019-03-11 00:53:45 +04:00 -
bc24c088c7
refactor: empty() preferred over size()
Maharramoff
2019-03-11 00:52:39 +04:00 -
06665dafde
refactor: redundant local variable
Maharramoff
2019-03-11 00:50:13 +04:00 -
0e0ae4ae43
clean
Rudy Huyn
2019-03-10 13:41:26 -07:00 -
8cc44b996e
Will
2019-03-10 14:59:27 -04:00 -
3272a53513
Modify the height of RowDltrUnits when UnitConverter is in LandscapeLayout mode
Rudy Huyn
2019-03-10 01:29:57 -08:00 -
f8f7d84f46
Remove rendertransform never used
Rudy Huyn
2019-03-10 00:29:10 -08:00 -
5bed302091
Formatting
Rudy Huyn
2019-03-10 00:19:45 -08:00 -
a98628261d
Fix auto-scaling of CalculationResult when the current locale displays symbols at the right
Rudy Huyn
2019-03-10 00:10:17 -08:00 -
48abffd2b7
Fix to ControlTemplate name for the OverflowTextBlock
Lance McCarthy
2019-03-10 00:24:09 -05:00 -
dfae65bc6f
Adjusted missed NumPad names in XAML, working on #64. All Tests Pass
Lance McCarthy
2019-03-10 00:12:00 -05:00 -
2b793b3661
Completed #62. Fixed x:Name, x:Uid, Automation property names and resources.
Lance McCarthy
2019-03-09 23:44:51 -05:00 -
9672f6df2b
Trim the beginning of the string too
Rudy Huyn
2019-03-09 17:29:51 -08:00 -
2ee2583d3d
CurrencyConverter: - remove extra space at the end of the value with some locales and numbers - fix formatting issue
Rudy Huyn
2019-03-09 17:13:24 -08:00 -
888a9316af
refactor: minor cleanup
Maharramoff
2019-03-10 03:59:34 +04:00 -
0f615faff9
Remove end-of-line from .editorconfig (#239)
Rudy Huyn
2019-03-09 15:46:32 -08:00 -
6a462fcbf4
merge with master
Rudy Huyn
2019-03-09 15:44:28 -08:00 -
b0a4feb3f0
Merge remote-tracking branch 'upstream/master' into AddEditorConfig
Rudy Huyn
2019-03-09 15:40:48 -08:00 -
60ba6255f4
remove end-of-line setting
Rudy Huyn
2019-03-09 15:28:20 -08:00 -
8983a1cb46
Eliminate redundant copies of EMPTY_UNIT object, saving 2.5 KB.
Jeff Genovy
2019-03-09 14:03:17 -08:00 -
ec9a30358c
Cyril Garsaud
2019-03-09 19:58:24 +01:00 -
a98cb50a70
fix: redundant semicolons (#230)
Shamkhal Maharramov
2019-03-09 20:16:05 +04:00 -
140a5b3b21
add .editorconfig to set some basic coding styles (#225)
Rudy Huyn
2019-03-09 08:09:51 -08:00 -
9fe9edcf58
Optimised images losslessly. Saved 301 KB out of 9.2 MB. 15.8% per file on average (up to 82.2%)
Guillaume RISCHARD
2019-03-09 15:34:51 +01:00 -
32dec4cc6f
fix: redundant semicolons
Maharramoff
2019-03-09 18:28:06 +04:00 -
36fbdd3f72
richu shaji abraham
2019-03-09 19:18:06 +05:30 -
6423563d98
reset sln
Rudy Huyn
2019-03-09 04:46:18 -08:00 -
bd9c6f5eba
Add Editor config
Rudy Huyn
2019-03-09 04:41:39 -08:00 -
212202cd8e
Cyril Garsaud
2019-03-09 12:35:17 +01:00 -
8ff4fa7830
Docs add File
dragon
2019-03-09 17:02:58 +08:00 -
cd87edcdee
File Test Add Hello Test
dragon
2019-03-09 16:43:51 +08:00 -
9e63b2c47b
- merge the 3 CalculationResultStyle(S|M|L) in App.xaml - Create a new MaxFontSize property in order to be able to update it without being forced to fully update the Style (because m_startingFontSize was set in OnApplyTemplate) - Modify how DisplayMargin to prevent the Margin to shift when we change its value withouth fully updating the Style
Rudy Huyn
2019-03-09 00:37:14 -08:00 -
4a399475f5
Dir Docs Add File Test
dragon
2019-03-09 16:20:59 +08:00 -
269500701b
Add Hello World README.md
dragon
2019-03-09 16:10:06 +08:00 -
248b762b80
Fix indentation and extra newline (#198)
Petr Sedláček
2019-03-09 08:47:40 +01:00 -
595ae6a8ff
Update punctuation in README.md (#205)
Ruige Lee
2019-03-09 15:18:41 +08:00 -
64c6493312
Brett Waldbaum
2019-03-08 23:15:28 -08:00 -
8eba0a6232
Fixed failed unit test
Brett Waldbaum
2019-03-08 22:57:32 -08:00 -
14afd77da4
clean
Rudy Huyn
2019-03-08 22:20:52 -08:00 -
0a14f63272
remove the minus sign
Rudy Huyn
2019-03-08 22:17:49 -08:00 -
407bd4e3df
fix fontweight
Rudy Huyn
2019-03-08 19:18:44 -08:00 -
b38db1ac2a
Merge remote-tracking branch 'upstream/master' into ActivateTextSelection
Rudy Huyn
2019-03-08 19:18:21 -08:00 -
17a35d862b
Activate IsTextSelectionEnable on CalculationResultStyleS only if the control is Active
Rudy Huyn
2019-03-08 19:16:25 -08:00 -
b088d9f356
Activate TextSelection on all interesting values
Rudy Huyn
2019-03-08 18:37:21 -08:00 -
fdcb74f953
PR feedback from Daniel
Brett Waldbaum
2019-03-08 18:19:22 -08:00 -
309b13961c
Merge branch 'buildw4' of https://github.com/bwaldbaum/calculator into buildw4
Brett Waldbaum
2019-03-08 16:22:14 -08:00 -
0ba3c9b746
Fixed merge conflicts
Brett Waldbaum
2019-03-08 16:21:31 -08:00 -
e2067d3e5b
Merge conflicts
Brett Waldbaum
2019-03-08 16:13:21 -08:00 -
20687eb591
Fixed merge conflict
Brett Waldbaum
2019-03-08 16:11:00 -08:00