Skip to content

Commit 28dcc35

Browse files
rcdaileycdunn2001
authored andcommitted
Normalize line endings
This commit contains nothing but line ending normalization changes. These changes were performed after the introduction of .gitattributes into the repository.
1 parent aaf3417 commit 28dcc35

File tree

6 files changed

+559
-559
lines changed

6 files changed

+559
-559
lines changed

Diff for: devtools/agent_vmw7.json

+33-33
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,33 @@
1-
{
2-
"cmake_variants" : [
3-
{"name": "generator",
4-
"generators": [
5-
{"generator": [
6-
"Visual Studio 7 .NET 2003",
7-
"Visual Studio 9 2008",
8-
"Visual Studio 9 2008 Win64",
9-
"Visual Studio 10",
10-
"Visual Studio 10 Win64",
11-
"Visual Studio 11",
12-
"Visual Studio 11 Win64"
13-
]
14-
},
15-
{"generator": ["MinGW Makefiles"],
16-
"env_prepend": [{"path": "c:/wut/prg/MinGW/bin"}]
17-
}
18-
]
19-
},
20-
{"name": "shared_dll",
21-
"variables": [
22-
["BUILD_SHARED_LIBS=true"],
23-
["BUILD_SHARED_LIBS=false"]
24-
]
25-
},
26-
{"name": "build_type",
27-
"build_types": [
28-
"debug",
29-
"release"
30-
]
31-
}
32-
]
33-
}
1+
{
2+
"cmake_variants" : [
3+
{"name": "generator",
4+
"generators": [
5+
{"generator": [
6+
"Visual Studio 7 .NET 2003",
7+
"Visual Studio 9 2008",
8+
"Visual Studio 9 2008 Win64",
9+
"Visual Studio 10",
10+
"Visual Studio 10 Win64",
11+
"Visual Studio 11",
12+
"Visual Studio 11 Win64"
13+
]
14+
},
15+
{"generator": ["MinGW Makefiles"],
16+
"env_prepend": [{"path": "c:/wut/prg/MinGW/bin"}]
17+
}
18+
]
19+
},
20+
{"name": "shared_dll",
21+
"variables": [
22+
["BUILD_SHARED_LIBS=true"],
23+
["BUILD_SHARED_LIBS=false"]
24+
]
25+
},
26+
{"name": "build_type",
27+
"build_types": [
28+
"debug",
29+
"release"
30+
]
31+
}
32+
]
33+
}

Diff for: devtools/agent_vmxp.json

+26-26
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
1-
{
2-
"cmake_variants" : [
3-
{"name": "generator",
4-
"generators": [
5-
{"generator": [
6-
"Visual Studio 6",
7-
"Visual Studio 7",
8-
"Visual Studio 8 2005"
9-
]
10-
}
11-
]
12-
},
13-
{"name": "shared_dll",
14-
"variables": [
15-
["BUILD_SHARED_LIBS=true"],
16-
["BUILD_SHARED_LIBS=false"]
17-
]
18-
},
19-
{"name": "build_type",
20-
"build_types": [
21-
"debug",
22-
"release"
23-
]
24-
}
25-
]
26-
}
1+
{
2+
"cmake_variants" : [
3+
{"name": "generator",
4+
"generators": [
5+
{"generator": [
6+
"Visual Studio 6",
7+
"Visual Studio 7",
8+
"Visual Studio 8 2005"
9+
]
10+
}
11+
]
12+
},
13+
{"name": "shared_dll",
14+
"variables": [
15+
["BUILD_SHARED_LIBS=true"],
16+
["BUILD_SHARED_LIBS=false"]
17+
]
18+
},
19+
{"name": "build_type",
20+
"build_types": [
21+
"debug",
22+
"release"
23+
]
24+
}
25+
]
26+
}

Diff for: makefiles/vs71/jsoncpp.sln

+46-46
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,46 @@
1-
Microsoft Visual Studio Solution File, Format Version 8.00
2-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lib_json", "lib_json.vcproj", "{B84F7231-16CE-41D8-8C08-7B523FF4225B}"
3-
ProjectSection(ProjectDependencies) = postProject
4-
EndProjectSection
5-
EndProject
6-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jsontest", "jsontest.vcproj", "{25AF2DD2-D396-4668-B188-488C33B8E620}"
7-
ProjectSection(ProjectDependencies) = postProject
8-
{B84F7231-16CE-41D8-8C08-7B523FF4225B} = {B84F7231-16CE-41D8-8C08-7B523FF4225B}
9-
EndProjectSection
10-
EndProject
11-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_lib_json", "test_lib_json.vcproj", "{B7A96B78-2782-40D2-8F37-A2DEF2B9C26D}"
12-
ProjectSection(ProjectDependencies) = postProject
13-
{B84F7231-16CE-41D8-8C08-7B523FF4225B} = {B84F7231-16CE-41D8-8C08-7B523FF4225B}
14-
EndProjectSection
15-
EndProject
16-
Global
17-
GlobalSection(SolutionConfiguration) = preSolution
18-
Debug = Debug
19-
dummy = dummy
20-
Release = Release
21-
EndGlobalSection
22-
GlobalSection(ProjectConfiguration) = postSolution
23-
{B84F7231-16CE-41D8-8C08-7B523FF4225B}.Debug.ActiveCfg = Debug|Win32
24-
{B84F7231-16CE-41D8-8C08-7B523FF4225B}.Debug.Build.0 = Debug|Win32
25-
{B84F7231-16CE-41D8-8C08-7B523FF4225B}.dummy.ActiveCfg = dummy|Win32
26-
{B84F7231-16CE-41D8-8C08-7B523FF4225B}.dummy.Build.0 = dummy|Win32
27-
{B84F7231-16CE-41D8-8C08-7B523FF4225B}.Release.ActiveCfg = Release|Win32
28-
{B84F7231-16CE-41D8-8C08-7B523FF4225B}.Release.Build.0 = Release|Win32
29-
{25AF2DD2-D396-4668-B188-488C33B8E620}.Debug.ActiveCfg = Debug|Win32
30-
{25AF2DD2-D396-4668-B188-488C33B8E620}.Debug.Build.0 = Debug|Win32
31-
{25AF2DD2-D396-4668-B188-488C33B8E620}.dummy.ActiveCfg = Debug|Win32
32-
{25AF2DD2-D396-4668-B188-488C33B8E620}.dummy.Build.0 = Debug|Win32
33-
{25AF2DD2-D396-4668-B188-488C33B8E620}.Release.ActiveCfg = Release|Win32
34-
{25AF2DD2-D396-4668-B188-488C33B8E620}.Release.Build.0 = Release|Win32
35-
{B7A96B78-2782-40D2-8F37-A2DEF2B9C26D}.Debug.ActiveCfg = Debug|Win32
36-
{B7A96B78-2782-40D2-8F37-A2DEF2B9C26D}.Debug.Build.0 = Debug|Win32
37-
{B7A96B78-2782-40D2-8F37-A2DEF2B9C26D}.dummy.ActiveCfg = Debug|Win32
38-
{B7A96B78-2782-40D2-8F37-A2DEF2B9C26D}.dummy.Build.0 = Debug|Win32
39-
{B7A96B78-2782-40D2-8F37-A2DEF2B9C26D}.Release.ActiveCfg = Release|Win32
40-
{B7A96B78-2782-40D2-8F37-A2DEF2B9C26D}.Release.Build.0 = Release|Win32
41-
EndGlobalSection
42-
GlobalSection(ExtensibilityGlobals) = postSolution
43-
EndGlobalSection
44-
GlobalSection(ExtensibilityAddIns) = postSolution
45-
EndGlobalSection
46-
EndGlobal
1+
Microsoft Visual Studio Solution File, Format Version 8.00
2+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lib_json", "lib_json.vcproj", "{B84F7231-16CE-41D8-8C08-7B523FF4225B}"
3+
ProjectSection(ProjectDependencies) = postProject
4+
EndProjectSection
5+
EndProject
6+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jsontest", "jsontest.vcproj", "{25AF2DD2-D396-4668-B188-488C33B8E620}"
7+
ProjectSection(ProjectDependencies) = postProject
8+
{B84F7231-16CE-41D8-8C08-7B523FF4225B} = {B84F7231-16CE-41D8-8C08-7B523FF4225B}
9+
EndProjectSection
10+
EndProject
11+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_lib_json", "test_lib_json.vcproj", "{B7A96B78-2782-40D2-8F37-A2DEF2B9C26D}"
12+
ProjectSection(ProjectDependencies) = postProject
13+
{B84F7231-16CE-41D8-8C08-7B523FF4225B} = {B84F7231-16CE-41D8-8C08-7B523FF4225B}
14+
EndProjectSection
15+
EndProject
16+
Global
17+
GlobalSection(SolutionConfiguration) = preSolution
18+
Debug = Debug
19+
dummy = dummy
20+
Release = Release
21+
EndGlobalSection
22+
GlobalSection(ProjectConfiguration) = postSolution
23+
{B84F7231-16CE-41D8-8C08-7B523FF4225B}.Debug.ActiveCfg = Debug|Win32
24+
{B84F7231-16CE-41D8-8C08-7B523FF4225B}.Debug.Build.0 = Debug|Win32
25+
{B84F7231-16CE-41D8-8C08-7B523FF4225B}.dummy.ActiveCfg = dummy|Win32
26+
{B84F7231-16CE-41D8-8C08-7B523FF4225B}.dummy.Build.0 = dummy|Win32
27+
{B84F7231-16CE-41D8-8C08-7B523FF4225B}.Release.ActiveCfg = Release|Win32
28+
{B84F7231-16CE-41D8-8C08-7B523FF4225B}.Release.Build.0 = Release|Win32
29+
{25AF2DD2-D396-4668-B188-488C33B8E620}.Debug.ActiveCfg = Debug|Win32
30+
{25AF2DD2-D396-4668-B188-488C33B8E620}.Debug.Build.0 = Debug|Win32
31+
{25AF2DD2-D396-4668-B188-488C33B8E620}.dummy.ActiveCfg = Debug|Win32
32+
{25AF2DD2-D396-4668-B188-488C33B8E620}.dummy.Build.0 = Debug|Win32
33+
{25AF2DD2-D396-4668-B188-488C33B8E620}.Release.ActiveCfg = Release|Win32
34+
{25AF2DD2-D396-4668-B188-488C33B8E620}.Release.Build.0 = Release|Win32
35+
{B7A96B78-2782-40D2-8F37-A2DEF2B9C26D}.Debug.ActiveCfg = Debug|Win32
36+
{B7A96B78-2782-40D2-8F37-A2DEF2B9C26D}.Debug.Build.0 = Debug|Win32
37+
{B7A96B78-2782-40D2-8F37-A2DEF2B9C26D}.dummy.ActiveCfg = Debug|Win32
38+
{B7A96B78-2782-40D2-8F37-A2DEF2B9C26D}.dummy.Build.0 = Debug|Win32
39+
{B7A96B78-2782-40D2-8F37-A2DEF2B9C26D}.Release.ActiveCfg = Release|Win32
40+
{B7A96B78-2782-40D2-8F37-A2DEF2B9C26D}.Release.Build.0 = Release|Win32
41+
EndGlobalSection
42+
GlobalSection(ExtensibilityGlobals) = postSolution
43+
EndGlobalSection
44+
GlobalSection(ExtensibilityAddIns) = postSolution
45+
EndGlobalSection
46+
EndGlobal

0 commit comments

Comments
 (0)