提交 326dc281 编写于 作者: A Arvid Gerstmann

Merge branch 'master' into HEAD

...@@ -39,3 +39,6 @@ captures/ ...@@ -39,3 +39,6 @@ captures/
# Keystore files # Keystore files
*.jks *.jks
# External native build folder generated in Android Studio 2.2 and later
.externalNativeBuild
...@@ -41,3 +41,11 @@ ...@@ -41,3 +41,11 @@
*.su *.su
*.idb *.idb
*.pdb *.pdb
# Kernel Module Compile Results
*.mod*
*.cmd
modules.order
Module.symvers
Mkfile.old
dkms.conf
...@@ -4,7 +4,7 @@ deps ...@@ -4,7 +4,7 @@ deps
*.beam *.beam
*.plt *.plt
erl_crash.dump erl_crash.dump
ebin ebin/*.beam
rel/example_project rel/example_project
.concrete/DEV_MODE .concrete/DEV_MODE
.rebar .rebar
...@@ -4,9 +4,6 @@ ...@@ -4,9 +4,6 @@
# User-specific stuff: # User-specific stuff:
.idea/workspace.xml .idea/workspace.xml
.idea/tasks.xml .idea/tasks.xml
.idea/dictionaries
.idea/vcs.xml
.idea/jsLibraryMappings.xml
# Sensitive or high-churn files: # Sensitive or high-churn files:
.idea/dataSources.ids .idea/dataSources.ids
......
...@@ -8,3 +8,6 @@ ...@@ -8,3 +8,6 @@
# Linux trash folder which might appear on any partition or disk # Linux trash folder which might appear on any partition or disk
.Trash-* .Trash-*
# .nfs files are created when an open file is removed but is still being accessed
.nfs*
...@@ -25,3 +25,6 @@ _testmain.go ...@@ -25,3 +25,6 @@ _testmain.go
# Output of the go coverage tool, specifically when used with LiteIDE # Output of the go coverage tool, specifically when used with LiteIDE
*.out *.out
# external packages folder
vendor/
...@@ -39,3 +39,6 @@ jspm_packages ...@@ -39,3 +39,6 @@ jspm_packages
# Optional REPL history # Optional REPL history
.node_repl_history .node_repl_history
# Output of 'npm pack'
*.tgz
...@@ -5,3 +5,6 @@ ...@@ -5,3 +5,6 @@
# Remove Cargo.lock from gitignore if creating an executable, leave it for libraries # Remove Cargo.lock from gitignore if creating an executable, leave it for libraries
# More information here http://doc.crates.io/guide.html#cargotoml-vs-cargolock # More information here http://doc.crates.io/guide.html#cargotoml-vs-cargolock
Cargo.lock Cargo.lock
# These are backup files generated by rustfmt
**/*.rs.bk
...@@ -110,6 +110,10 @@ _TeamCity* ...@@ -110,6 +110,10 @@ _TeamCity*
# DotCover is a Code Coverage Tool # DotCover is a Code Coverage Tool
*.dotCover *.dotCover
# Visual Studio code coverage results
*.coverage
*.coveragexml
# NCrunch # NCrunch
_NCrunch_* _NCrunch_*
.*crunch*.local.xml .*crunch*.local.xml
...@@ -189,6 +193,7 @@ ClientBin/ ...@@ -189,6 +193,7 @@ ClientBin/
*~ *~
*.dbmdl *.dbmdl
*.dbproj.schemaview *.dbproj.schemaview
*.jfm
*.pfx *.pfx
*.publishsettings *.publishsettings
node_modules/ node_modules/
...@@ -258,3 +263,6 @@ paket-files/ ...@@ -258,3 +263,6 @@ paket-files/
# Python Tools for Visual Studio (PTVS) # Python Tools for Visual Studio (PTVS)
__pycache__/ __pycache__/
*.pyc *.pyc
# Cake - Uncomment if you are using it
# tools/
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册