• A
    Merge branch 'master' into patch-1 · f17925fe
    Antoine Cœur 提交于
    * 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
    f17925fe
Objective-C.gitignore 825 字节