* 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
xcuserstate files are generated from within Xcode and saved in your project bundle to remember your last opened file, the open state of any group folders, open tabs, and any other user setting your project might need to remember, this is something that shouldn't be tracked in version control
Restore the Xcode rules to the Objective-C template as per the discussion
thread on 5bd4330. Although the rules correspond to an IDE and so are
global, most users of the Obj-C template expect to find the Xcode rules
in the template generated by github.com, since the IDE is so ubiquitous.
This could possibly be resolved by adding a template transclusion
mechanism in the future, but for now duplication is the way to go.
