diff options
| author | lempamo <[email protected]> | 2017-07-01 11:33:34 -0400 |
|---|---|---|
| committer | lempamo <[email protected]> | 2017-07-01 11:33:34 -0400 |
| commit | 1e15555a88864a6398b3bc811cc22f62be203f7b (patch) | |
| tree | 2f5bace7a231b22ba7a74279ead0d4107df31175 /.gitignore | |
| parent | fc728100a39bff88215b0b21602afbda9ff6b00b (diff) | |
| parent | 6357242767ded19a6f30fc1c0ecd82c0bdc62ac4 (diff) | |
| download | histacom2-1e15555a88864a6398b3bc811cc22f62be203f7b.tar.gz histacom2-1e15555a88864a6398b3bc811cc22f62be203f7b.tar.bz2 histacom2-1e15555a88864a6398b3bc811cc22f62be203f7b.zip | |
Merge remote-tracking branch 'refs/remotes/TimeHACKDevs/master'
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 24 |
1 files changed, 7 insertions, 17 deletions
@@ -294,18 +294,6 @@ publish/ # in these scripts will be unencrypted PublishScripts/ -# NuGet Packages -*.nupkg -# The packages folder can be ignored because of Package Restore -**/packages/* -# except build/, which is used as an MSBuild target. -!**/packages/build/ -# Uncomment if necessary however generally it will be regenerated when needed -#!**/packages/repositories.config -# NuGet v3's project.json files produces more ignorable files -*.nuget.props -*.nuget.targets - # Microsoft Azure Build Output csx/ *.build.csdef @@ -399,7 +387,8 @@ _Pvt_Extensions paket-files/ # FAKE - F# Make -.fake/ + +!.fake/ # JetBrains Rider .idea/ @@ -432,10 +421,10 @@ TimeHACK.Main\bin\Debug TimeHACK.Main\bin\Release TimeHACK.Main\obj\Debug\* TimeHACK.Main\obj\Release\* -TimeHACK.Engine\bin\Debug\* -TimeHACK.Engine\bin\Release\* -TimeHACK.Engine\obj\Debug -TimeHACK.Engine\obj\Release +TimeHACK.Engine\bin\Debug +TimeHACK.Engine\bin\Release +TimeHACK.Engine\obj\Debug\* +TimeHACK.Engine\obj\Release\* # The below files keep the Resources working @@ -455,6 +444,7 @@ TimeHACK.Engine\obj\Release !TimeHACK.Engine\obj\Release\DesignTimeResolveAssemblyReferences.cache !TimeHACK.Engine\obj\Release\DesignTimeResolveAssemblyReferencesInput.cache !TimeHACK.Engine\obj\Release\CoreCompileInputs.cache +!packages # Including the .idea directory within repositories is a BAD idea: # - contributors that do not use IntelliJ will end up producing commits later on |