1. 15 Aug, 2015 1 commit
    • Antoine Cœur's avatar
      Merge branch 'master' into patch-1 · f17925fe
      Antoine Cœur authored
      * 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
  2. 07 Aug, 2015 1 commit
  3. 06 Aug, 2015 1 commit
  4. 31 Jul, 2015 1 commit
  5. 30 Jul, 2015 2 commits
  6. 27 Jul, 2015 1 commit
  7. 23 Jul, 2015 2 commits
  8. 22 Jul, 2015 2 commits
  9. 15 Jul, 2015 6 commits
  10. 13 Jul, 2015 1 commit
  11. 06 Jul, 2015 1 commit
  12. 02 Jul, 2015 1 commit
  13. 01 Jul, 2015 1 commit
  14. 30 Jun, 2015 3 commits
  15. 28 Jun, 2015 1 commit
  16. 27 Jun, 2015 1 commit
  17. 25 Jun, 2015 1 commit
  18. 24 Jun, 2015 4 commits
  19. 23 Jun, 2015 1 commit
  20. 17 Jun, 2015 3 commits
  21. 11 Jun, 2015 1 commit
  22. 09 Jun, 2015 1 commit
    • Brian Gesiak's avatar
      [ObjC][Swift] Ignore Xcode SCM blueprint files · 4323f1e2
      Brian Gesiak authored
      These files are automatically generated by Xcode and maintain
      information regarding source control. Xcode is typically used
      in Objective-C and Swift projects, so add these to the ignored files for
      these platforms.
      4323f1e2
  23. 08 Jun, 2015 1 commit
  24. 02 Jun, 2015 1 commit
  25. 01 Jun, 2015 1 commit