aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex-TIMEHACK <[email protected]>2017-06-17 14:36:19 +0100
committerAlex-TIMEHACK <[email protected]>2017-06-17 14:36:19 +0100
commit9031d3a6c69ba425452bc63580125a3fb042093d (patch)
tree263aac19b832831def6f18cdaa0e34e82a30eb63
parentdcbf41b4070d46146fd6801a0f64161d4f570ec3 (diff)
parentf50e7e4d857d98c6aa237b97ee026a309503d079 (diff)
downloadhistacom2-9031d3a6c69ba425452bc63580125a3fb042093d.tar.gz
histacom2-9031d3a6c69ba425452bc63580125a3fb042093d.tar.bz2
histacom2-9031d3a6c69ba425452bc63580125a3fb042093d.zip
Merge remote-tracking branch 'refs/remotes/TimeHACKDevs/master'
-rw-r--r--.gitignore5
1 files changed, 5 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 2bd9d2e..4236ef4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -384,6 +384,7 @@ typings/
# Visual Studio 6 auto-generated workspace file (contains which files were open etc.)
*.vbw
+
# Visual Studio LightSwitch build output
**/*.HTMLClient/GeneratedArtifacts
**/*.DesktopClient/GeneratedArtifacts
@@ -427,9 +428,13 @@ __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.Engine\obj\Debug
+TimeHACK.Engine\obj\Release
# Including the .idea directory within repositories is a BAD idea:
# - contributors that do not use IntelliJ will end up producing commits later on