Skip to content

Commit 0a95b8c

Browse files
brendanx67brendanx67
committed
Merge remote-tracking branch 'remotes/origin/master' into Skyline/work/20250102_FilesView
2 parents c6b19d6 + 5747ede commit 0a95b8c

File tree

3,486 files changed

+9099
-3485
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

3,486 files changed

+9099
-3485
lines changed

‎.editorconfig‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,11 @@
1-
[*.cs]
1+
# Top-most EditorConfig file
2+
root = true
3+
4+
# All files - UTF-8 without BOM
5+
[*]
6+
charset = utf-8
7+
8+
[*.cs]
29

310
# IDE0011: Add braces
411
csharp_prefer_braces = true

‎.vscode/settings.json‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"dotnet.preferCSharpExtension": true,
3+
"dotnet.defaultSolution": "pwiz_tools/Skyline/Skyline.sln"
4+
}

‎ThermoMethod.bat‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
C:\proj\review\pwiz_tools\Skyline\bin\x64\Debug\Method\Thermo\BuildThermoMethod.exe -t -m "E:\test\20250212_ThermoMethod\ThoriumMethod\60SPD_PQ500PRTC_ToAlignTemplate.meth" "E:\test\20250212_ThermoMethod\ThoriumMethod\13xjtwsa.qkw\transitions.txt"

0 commit comments

Comments
 (0)