diff options
| author | Antoine Cœur <coeur@gmx.fr> | 2015-08-15 22:35:32 +0800 |
|---|---|---|
| committer | Antoine Cœur <coeur@gmx.fr> | 2015-08-15 22:35:32 +0800 |
| commit | f17925fe612c42e8d3a5a61beb555ed610d98c6f (patch) | |
| tree | 2538c62ef7a239bf39de7c54bd3190bc0f2b658e /Global | |
| parent | f85cff8fbeb8bf07dd1217722a617d947160f556 (diff) | |
| parent | 573fd7e4d914daa07b846cdc4323bd4813c9f204 (diff) | |
| download | gitignore-f17925fe612c42e8d3a5a61beb555ed610d98c6f.tar.gz gitignore-f17925fe612c42e8d3a5a61beb555ed610d98c6f.zip | |
Merge branch 'master' into patch-1
* 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
Diffstat (limited to 'Global')
| -rw-r--r-- | Global/JetBrains.gitignore | 2 | ||||
| -rw-r--r-- | Global/Xcode.gitignore | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/Global/JetBrains.gitignore b/Global/JetBrains.gitignore index 5f1d7b68..573bcf45 100644 --- 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 index c08bace2..37de8bb4 100644 --- a/Global/Xcode.gitignore +++ b/Global/Xcode.gitignore @@ -18,5 +18,6 @@ DerivedData/ xcuserdata/ ## Other -*.xccheckout *.moved-aside +*.xccheckout +*.xcscmblueprint |