Merge branch 'master' into patch-1

Coeur · Coeur · commit f17925fe612c · 2015-08-15T22:35:32.000+08:00
* master: (24 commits)
  Add ignore for npm debug log files
  Add KiCad ignore for .bck and .kicad_pcb-bak
  Correct capitalisation of LightSwitch and omit generated.parameters.xml
  Add newline at EOF
  Add ignores for Visual Studio Lightswitch build output
  Adding optional ignore proposal for wwwroot folder
  Ignore NCrunch temporary files.
  Update Dart.gitignore
  Added .stack-work/ directory to Haskell .gitignore.
  add Android Studio to the covers list
  Ignore Default RSpec State File
  Ignore *.auxlock files created by TikZ in TeX
  Ignore files created by `\tikzexternalize`
  Update Typo3.gitignore for CMS v6.2
  [ObjC][Swift] Ignore Xcode SCM blueprint files
  include preamble files generated by mylatexformat package
  Add .jar, .exe and .msi
  Remove .SRCINFO (and old .AURINFO) from .gitignore
  Add CMakeScripts directory
  ignore OAuth2 token
  ...

Conflicts:
	Objective-C.gitignore
	Swift.gitignore
diff --git a/Android.gitignore b/Android.gitignore
@@ -24,3 +24,6 @@ proguard/
 
 # Log Files
 *.log
+
+# Android Studio Navigation editor temp files
+.navigation/
diff --git a/ArchLinuxPackages.gitignore b/ArchLinuxPackages.gitignore
@@ -1,14 +1,13 @@
 *.tar
 *.tar.*
+*.jar
+*.exe
+*.msi
 *.zip
 *.tgz
 *.log
 *.log.*
 *.sig
 
-# AUR metadata
-.AURINFO
-.SRCINFO
-
 pkg/
 src/
diff --git a/CMake.gitignore b/CMake.gitignore
@@ -1,5 +1,6 @@
 CMakeCache.txt
 CMakeFiles
+CMakeScripts
 Makefile
 cmake_install.cmake
 install_manifest.txt
diff --git a/Dart.gitignore b/Dart.gitignore
@@ -3,6 +3,7 @@
 .pub/
 build/
 packages
+.packages
 
 # Or the files created by dart2js.
 *.dart.js
diff --git a/Global/JetBrains.gitignore b/Global/JetBrains.gitignore
@@ -1,4 +1,4 @@
-# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio
 
 *.iml
 
diff --git a/Global/Xcode.gitignore b/Global/Xcode.gitignore
@@ -18,5 +18,6 @@ DerivedData/
 xcuserdata/
 
 ## Other
-*.xccheckout
 *.moved-aside
+*.xccheckout
+*.xcscmblueprint
diff --git a/Haskell.gitignore b/Haskell.gitignore
@@ -13,3 +13,4 @@ cabal.sandbox.config
 *.prof
 *.aux
 *.hp
+.stack-work/
diff --git a/KiCAD.gitignore b/KiCAD.gitignore
@@ -3,6 +3,8 @@
 # Temporary files
 *.000
 *.bak
+*.bck
+*.kicad_pcb-bak
 
 # Netlist files (exported from Eeschema)
 *.net
diff --git a/Maven.gitignore b/Maven.gitignore
@@ -1,5 +1,4 @@
 target/
-**/target/
 pom.xml.tag
 pom.xml.releaseBackup
 pom.xml.versionsBackup
diff --git a/Meteor.gitignore b/Meteor.gitignore
diff --git a/Node.gitignore b/Node.gitignore
@@ -1,6 +1,7 @@
 # Logs
 logs
 *.log
+npm-debug.log*
 
 # Runtime data
 pids
diff --git a/Objective-C.gitignore b/Objective-C.gitignore
@@ -18,8 +18,9 @@ DerivedData/
 xcuserdata/
 
 ## Other
-*.xccheckout
 *.moved-aside
+*.xccheckout
+*.xcscmblueprint
 
 ## Obj-C/Swift specific
 *.hmap
diff --git a/R.gitignore b/R.gitignore
@@ -11,3 +11,6 @@
 # produced vignettes
 vignettes/*.html
 vignettes/*.pdf
+
+# OAuth2 token, see https://github.com/hadley/httr/releases/tag/v0.3
+.httr-oauth
diff --git a/Ruby.gitignore b/Ruby.gitignore
@@ -5,6 +5,7 @@
 /InstalledFiles
 /pkg/
 /spec/reports/
+/spec/examples.txt
 /test/tmp/
 /test/version_tmp/
 /tmp/
diff --git a/Sass.gitignore b/Sass.gitignore
@@ -1,2 +1,2 @@
-.sass-cache
+.sass-cache/
 *.css.map
diff --git a/Swift.gitignore b/Swift.gitignore
@@ -18,8 +18,9 @@ DerivedData/
 xcuserdata/
 
 ## Other
-*.xccheckout
 *.moved-aside
+*.xccheckout
+*.xcscmblueprint
 
 ## Obj-C/Swift specific
 *.hmap
diff --git a/TeX.gitignore b/TeX.gitignore
@@ -33,6 +33,7 @@
 
 ## Auxiliary and intermediate files from other packages:
 
+
 # algorithms
 *.alg
 *.loa
@@ -103,6 +104,9 @@ _minted*
 # morewrites
 *.mw
 
+# mylatexformat
+*.fmt
+
 # nomencl
 *.nlo
 
@@ -116,6 +120,11 @@ _minted*
 *.sympy
 sympy-plots-for-*.tex/
 
+# TikZ & PGF
+*.dpth
+*.md5
+*.auxlock
+
 # todonotes
 *.tdo
 
diff --git a/Typo3.gitignore b/Typo3.gitignore
@@ -1,18 +1,20 @@
-## TYPO3 v4
+## TYPO3 v6.2
 # Ignore serveral upload and file directories.
 /fileadmin/user_upload/
 /fileadmin/_temp_/
+/fileadmin/_processed_/
 /uploads/
 # Ignore cache
 /typo3conf/temp_CACHED*
 /typo3conf/temp_fieldInfo.php
-# Ignore local config which overrides typo3 config.
-# You should include your local stuff with `@include('localconf_local.php');` at the end of localconf.php.
-# See http://stackoverflow.com/questions/11905360/how-best-to-manage-typo3-installations-using-git for details.
-/typo3conf/localconf_local.php
+/typo3conf/deprecation_*.log
+/typo3conf/AdditionalConfiguration.php
 # Ignore system folders, you should have them symlinked.
-# If not comment out the following two entries.
+# If not comment out the following entries.
 /typo3
-/t3lib
+/typo3_src
+/typo3_src-*
+/.htaccess
+/index.php
 # Ignore temp directory.
 /typo3temp/
diff --git a/VisualStudio.gitignore b/VisualStudio.gitignore
@@ -24,6 +24,8 @@ bld/
 
 # Visual Studio 2015 cache/options directory
 .vs/
+# Uncomment if you have tasks that create the project's static files in wwwroot
+#wwwroot/
 
 # MSTest test Results
 [Tt]est[Rr]esult*/
@@ -106,6 +108,7 @@ _TeamCity*
 # NCrunch
 _NCrunch_*
 .*crunch*.local.xml
+nCrunchTemp_*
 
 # MightyMoose
 *.mm.*
@@ -203,3 +206,11 @@ FakesAssemblies/
 
 # Visual Studio 6 workspace options file
 *.opt
+
+# Visual Studio LightSwitch build output
+**/*.HTMLClient/GeneratedArtifacts
+**/*.DesktopClient/GeneratedArtifacts
+**/*.DesktopClient/ModelManifest.xml
+**/*.Server/GeneratedArtifacts
+**/*.Server/ModelManifest.xml
+_Pvt_Extensions

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion`
	`1`	`+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio`
`2`	`2`
`3`	`3`	`*.iml`
`4`	`4`
-Original file line number
+Diff line change
 *.prof
 *.aux
 *.hp
 +.stack-work/
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`target/`
`2`		`-**/target/`
`3`	`2`	`pom.xml.tag`
`4`	`3`	`pom.xml.releaseBackup`
`5`	`4`	`pom.xml.versionsBackup`