浏览代码

Merge branch 'master' into HEAD

Arvid Gerstmann 8 年之前
父节点
当前提交
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
 # Keystore files
 *.jks
 *.jks
+
+# External native build folder generated in Android Studio 2.2 and later
+.externalNativeBuild

+ 8 - 0
C.gitignore

@@ -41,3 +41,11 @@
 *.su
 *.su
 *.idb
 *.idb
 *.pdb
 *.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
 *.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

+ 1 - 0
Global/Ansible.gitignore

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

+ 0 - 3
Global/JetBrains.gitignore

@@ -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

+ 3 - 0
Global/Linux.gitignore

@@ -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*

+ 3 - 0
Go.gitignore

@@ -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/

+ 3 - 0
Node.gitignore

@@ -39,3 +39,6 @@ jspm_packages
 
 
 # Optional REPL history
 # Optional REPL history
 .node_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
 # 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

+ 8 - 0
VisualStudio.gitignore

@@ -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/
 *~
 *~
 *.dbmdl
 *.dbmdl
 *.dbproj.schemaview
 *.dbproj.schemaview
+*.jfm
 *.pfx
 *.pfx
 *.publishsettings
 *.publishsettings
 node_modules/
 node_modules/
@@ -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/