diff options
| author | Alex-TIMEHACK <[email protected]> | 2017-06-17 09:10:20 +0100 |
|---|---|---|
| committer | Alex-TIMEHACK <[email protected]> | 2017-06-17 09:10:20 +0100 |
| commit | 3caf2962cfab80a186a72765ce203bbf7e58c27a (patch) | |
| tree | 16606585f519d801c283a95afb17df93c7bff9da /.gitattributes | |
| parent | 3a8ada000aebbe5de46dce584a5d2b4432ddb5ad (diff) | |
| parent | cfed11508eadd97c31fc9c4968785803b431c993 (diff) | |
| download | histacom2-3caf2962cfab80a186a72765ce203bbf7e58c27a.tar.gz histacom2-3caf2962cfab80a186a72765ce203bbf7e58c27a.tar.bz2 histacom2-3caf2962cfab80a186a72765ce203bbf7e58c27a.zip | |
Updated my fork AGAIN
# Conflicts:
# .vs/TimeHACK/v15/.suo
# TimeHACK.Engine/bin/Release/TimeHACK.Engine.dll
# TimeHACK.Engine/bin/Release/TimeHACK.Engine.pdb
# TimeHACK.Engine/obj/Release/CoreCompileInputs.cache
# TimeHACK.Engine/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache
# TimeHACK.Engine/obj/Release/TimeHACK.Engine.csproj.GenerateResource.Cache
# TimeHACK.Engine/obj/Release/TimeHACK.Engine.csprojResolveAssemblyReference.cache
# TimeHACK.Engine/obj/Release/TimeHACK.Engine.dll
# TimeHACK.Engine/obj/Release/TimeHACK.Engine.pdb
# TimeHACK.Main/bin/Release/TimeHACK.Engine.dll
# TimeHACK.Main/bin/Release/TimeHACK.Engine.pdb
# TimeHACK.Main/bin/Release/TimeHACK.application
# TimeHACK.Main/bin/Release/TimeHACK.exe
# TimeHACK.Main/bin/Release/TimeHACK.exe.manifest
# TimeHACK.Main/bin/Release/TimeHACK.pdb
# TimeHACK.Main/bin/Release/app.publish/TimeHACK.exe
# TimeHACK.Main/obj/Release/CoreCompileInputs.cache
# TimeHACK.Main/obj/Release/DesignTimeResolveAssemblyReferences.cache
# TimeHACK.Main/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache
# TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.FileListAbsolute.txt
# TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.GenerateResource.Cache
# TimeHACK.Main/obj/Release/TimeHACK.Main.csprojResolveAssemblyReference.cache
# TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Win95Apps.WinClassicIE4.resources
# TimeHACK.Main/obj/Release/TimeHACK.Properties.Resources.resources
# TimeHACK.Main/obj/Release/TimeHACK.WinClassicForms.WinClassicInstaller.resources
# TimeHACK.Main/obj/Release/TimeHACK.application
# TimeHACK.Main/obj/Release/TimeHACK.exe
# TimeHACK.Main/obj/Release/TimeHACK.exe.manifest
# TimeHACK.Main/obj/Release/TimeHACK.pdb
Diffstat (limited to '.gitattributes')
| -rw-r--r-- | .gitattributes | 65 |
1 files changed, 65 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..130cddb --- /dev/null +++ b/.gitattributes @@ -0,0 +1,65 @@ +# Normalise line endings +* text=auto + +# Common Settings +# https://github.com/alexkaratarakis/gitattributes/blob/master/Common.gitattributes +# - Documents +*.doc diff=astextplain +*.DOC diff=astextplain +*.docx diff=astextplain +*.DOCX diff=astextplain +*.dot diff=astextplain +*.DOT diff=astextplain +*.pdf diff=astextplain +*.PDF diff=astextplain +*.rtf diff=astextplain +*.RTF diff=astextplain +*.md text +*.adoc text +*.textile text +*.mustache text +*.csv text +*.tab text +*.tsv text +*.sql text + +# - Graphics +*.png binary +*.jpg binary +*.jpeg binary +*.gif binary +*.tif binary +*.tiff binary +*.ico binary +# Might want to treat svg as text +*.svg binary +*.eps binary + +# C# Settings +# https://github.com/alexkaratarakis/gitattributes/blob/master/CSharp.gitattributes +*.cs diff=csharp + +# Visual Studio Settings +# https://github.com/alexkaratarakis/gitattributes/blob/master/VisualStudio.gitattributes +*.sln text eol=crlf +*.csproj text eol=crlf +*.vbproj text eol=crlf +*.vcxproj text eol=crlf +*.vcproj text eol=crlf +*.dbproj text eol=crlf +*.fsproj text eol=crlf +*.lsproj text eol=crlf +*.wixproj text eol=crlf +*.modelproj text eol=crlf +*.sqlproj text eol=crlf +*.wmaproj text eol=crlf + +*.xproj text eol=crlf +*.props text eol=crlf +*.filters text eol=crlf +*.vcxitems text eol=crlf + +# Extra Settings +*.dll binary +*.lib binary +*.exe binary |