diff options
| author | Alex-TIMEHACK <[email protected]> | 2017-06-17 14:52:55 +0100 |
|---|---|---|
| committer | Alex-TIMEHACK <[email protected]> | 2017-06-17 14:52:55 +0100 |
| commit | 6679f364d2c5c4cbe90059f6dcc7091aeee387b6 (patch) | |
| tree | 8f9e2dccd103310ba05ad61f16ec096be990db12 | |
| parent | 9031d3a6c69ba425452bc63580125a3fb042093d (diff) | |
| parent | 14044d4e575282c17c6c195ef2c3b3cda506772d (diff) | |
| download | histacom2-6679f364d2c5c4cbe90059f6dcc7091aeee387b6.tar.gz histacom2-6679f364d2c5c4cbe90059f6dcc7091aeee387b6.tar.bz2 histacom2-6679f364d2c5c4cbe90059f6dcc7091aeee387b6.zip | |
Merge remote-tracking branch 'refs/remotes/TimeHACKDevs/master'
| -rw-r--r-- | .gitignore | 20 |
1 files changed, 16 insertions, 4 deletions
@@ -378,6 +378,7 @@ typings/ # Visual Studio 6 build log *.plg + # Visual Studio 6 workspace options file *.opt @@ -429,13 +430,24 @@ __pycache__/ ### TimeHack Extra ### 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.Main\obj\Debug\* +TimeHACK.Main\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 + +!TimeHACK.Main\obj\Debug\TempPE +!TimeHACK.Main\obj\Debug\DesignTimeResolveAssemblyReferencesInput.cache +!TimeHACK.Main\obj\Release\TempPE +!TimeHACK.Main\obj\Release\DesignTimeResolveAssemblyReferencesInput.cache +!TimeHACK.Engine\obj\Debug\TempPE +!TimeHACK.Engine\obj\Debug\DesignTimeResolveAssemblyReferencesInput.cache +!TimeHACK.Engine\obj\Release\TempPE +!TimeHACK.Engine\obj\Release\DesignTimeResolveAssemblyReferencesInput.cache + # Including the .idea directory within repositories is a BAD idea: # - contributors that do not use IntelliJ will end up producing commits later on # making changes to .idea that aren't really part of that commit, or just plain |