Merge branch 'master' into 孙英皓

Merge branch '杨腾泽' into 孙英皓
change
1 changed files with 1 additions and 1 deletions
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@ -3,7 +3,7 @@
        {
            "type": "cppbuild",
            "label": "C/C++: g++.exe build active file",
-            "command": "C:\\mingw64\\bin\\g++.exe",
+            "command": "C:\\mingw64\\mingw64\\bin\\g++.exe",
            "args": [
                "-fdiagnostics-color=always",
                "-g",
Author	SHA1	Message	Date
yangtengze	5b710f6061	Merge branch 'master' into 孙英皓	2 years ago
yangtengze	c5d0a0f0d6	Merge branch '杨腾泽' into 孙英皓	2 years ago
yangtengze	d94e2c5073	change	2 years ago
yangtengze	ecde64cfb1	1	2 years ago
yangtengze	b70004871f	1	2 years ago
yangtengze	e9870a3c9f	1	2 years ago
yangtengze	97ae647984	1	2 years ago
yangtengze	abe10bbc21	Merge branch '李聪颖'	2 years ago
yangtengze	73da6d241f	1	2 years ago
李聪颖	c246bb4f18	okkkk	2 years ago
孙英皓	8dd2c38bed	1	2 years ago
孙英皓	811b2e2e24	Merge branch 'master' into 孙英皓	2 years ago