瀏覽代碼

Merge branch 'master' into HEAD

pull/2093/head
Arvid Gerstmann 7 年之前
父節點
當前提交
326dc281e5
共有 10 個檔案被更改,包括 33 行新增4 行删除
  1. 3
    0
      Android.gitignore
  2. 8
    0
      C.gitignore
  3. 1
    1
      Erlang.gitignore
  4. 1
    0
      Global/Ansible.gitignore
  5. 0
    3
      Global/JetBrains.gitignore
  6. 3
    0
      Global/Linux.gitignore
  7. 3
    0
      Go.gitignore
  8. 3
    0
      Node.gitignore
  9. 3
    0
      Rust.gitignore
  10. 8
    0
      VisualStudio.gitignore

+ 3
- 0
Android.gitignore 查看文件

@@ -39,3 +39,6 @@ captures/

# Keystore files
*.jks

# External native build folder generated in Android Studio 2.2 and later
.externalNativeBuild

+ 8
- 0
C.gitignore 查看文件

@@ -41,3 +41,11 @@
*.su
*.idb
*.pdb

# Kernel Module Compile Results
*.mod*
*.cmd
modules.order
Module.symvers
Mkfile.old
dkms.conf

+ 1
- 1
Erlang.gitignore 查看文件

@@ -4,7 +4,7 @@ deps
*.beam
*.plt
erl_crash.dump
ebin
ebin/*.beam
rel/example_project
.concrete/DEV_MODE
.rebar

+ 1
- 0
Global/Ansible.gitignore 查看文件

@@ -0,0 +1 @@
*.retry

+ 0
- 3
Global/JetBrains.gitignore 查看文件

@@ -4,9 +4,6 @@
# User-specific stuff:
.idea/workspace.xml
.idea/tasks.xml
.idea/dictionaries
.idea/vcs.xml
.idea/jsLibraryMappings.xml

# Sensitive or high-churn files:
.idea/dataSources.ids

+ 3
- 0
Global/Linux.gitignore 查看文件

@@ -8,3 +8,6 @@

# Linux trash folder which might appear on any partition or disk
.Trash-*

# .nfs files are created when an open file is removed but is still being accessed
.nfs*

+ 3
- 0
Go.gitignore 查看文件

@@ -25,3 +25,6 @@ _testmain.go

# Output of the go coverage tool, specifically when used with LiteIDE
*.out

# external packages folder
vendor/

+ 3
- 0
Node.gitignore 查看文件

@@ -39,3 +39,6 @@ jspm_packages

# Optional REPL history
.node_repl_history

# Output of 'npm pack'
*.tgz

+ 3
- 0
Rust.gitignore 查看文件

@@ -5,3 +5,6 @@
# 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
Cargo.lock

# These are backup files generated by rustfmt
**/*.rs.bk

+ 8
- 0
VisualStudio.gitignore 查看文件

@@ -110,6 +110,10 @@ _TeamCity*
# DotCover is a Code Coverage Tool
*.dotCover

# Visual Studio code coverage results
*.coverage
*.coveragexml

# NCrunch
_NCrunch_*
.*crunch*.local.xml
@@ -189,6 +193,7 @@ ClientBin/
*~
*.dbmdl
*.dbproj.schemaview
*.jfm
*.pfx
*.publishsettings
node_modules/
@@ -258,3 +263,6 @@ paket-files/
# Python Tools for Visual Studio (PTVS)
__pycache__/
*.pyc

# Cake - Uncomment if you are using it
# tools/

Loading…
取消
儲存