From 47595e922b119110da432a9e27591a1b78ce1eaf Mon Sep 17 00:00:00 2001 From: Christopher Dunn Date: Sun, 9 Aug 2015 15:53:23 -0700 Subject: [PATCH 1/2] normalized some windows VS stuff --- devtools/agent_vmw7.json | 10 +++++----- devtools/agent_vmxp.json | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/devtools/agent_vmw7.json b/devtools/agent_vmw7.json index 0810a99..cd7b777 100644 --- a/devtools/agent_vmw7.json +++ b/devtools/agent_vmw7.json @@ -10,12 +10,12 @@ "Visual Studio 10 Win64", "Visual Studio 11", "Visual Studio 11 Win64" - ] + ] }, - {"generator": ["MinGW Makefiles"], + {"generator": ["MinGW Makefiles"], "env_prepend": [{"path": "c:/wut/prg/MinGW/bin"}] } - ] + ] }, {"name": "shared_dll", "variables": [ @@ -25,8 +25,8 @@ }, {"name": "build_type", "build_types": [ - "debug", - "release" + "debug", + "release" ] } ] diff --git a/devtools/agent_vmxp.json b/devtools/agent_vmxp.json index b627a72..f82a077 100644 --- a/devtools/agent_vmxp.json +++ b/devtools/agent_vmxp.json @@ -6,9 +6,9 @@ "Visual Studio 6", "Visual Studio 7", "Visual Studio 8 2005" - ] + ] } - ] + ] }, {"name": "shared_dll", "variables": [ @@ -18,8 +18,8 @@ }, {"name": "build_type", "build_types": [ - "debug", - "release" + "debug", + "release" ] } ] From 7f4be39e9fe5192aaa7b2473f75e4ffd3d3a2f7a Mon Sep 17 00:00:00 2001 From: Christopher Dunn Date: Sun, 9 Aug 2015 15:42:06 -0700 Subject: [PATCH 2/2] add .gitattributes helps #325 --- .gitattributes | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.gitattributes b/.gitattributes index 63e493a..22d2b7a 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,6 +1,11 @@ * text=auto +*.h text +*.cpp text +*.json text +*.in text *.sh eol=lf *.bat eol=crlf *.vcproj eol=crlf *.vcxproj eol=crlf *.sln eol=crlf +devtools/agent_vm* eol=crlf