This repository has been archived by the owner on Oct 20, 2023. It is now read-only.
-
-
Notifications
You must be signed in to change notification settings - Fork 673
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1315 from oliverw/dev
Dev v71
- Loading branch information
Showing
22 changed files
with
3,019 additions
and
2,806 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,63 +1,192 @@ | ||
| ############################################################################### | ||
| # Set default behavior to automatically normalize line endings. | ||
| ############################################################################### | ||
| # * text=auto | ||
|
|
||
| ############################################################################### | ||
| # Set default behavior for command prompt diff. | ||
| # | ||
| # This is need for earlier builds of msysgit that does not have it on by | ||
| # default for csharp files. | ||
| # Note: This is only used by command line | ||
| ############################################################################### | ||
| #*.cs diff=csharp | ||
|
|
||
| ############################################################################### | ||
| # Set the merge driver for project and solution files | ||
| # | ||
| # Merging from the command prompt will add diff markers to the files if there | ||
| # are conflicts (Merging from VS is not affected by the settings below, in VS | ||
| # the diff markers are never inserted). Diff markers may cause the following | ||
| # file extensions to fail to load in VS. An alternative would be to treat | ||
| # these files as binary and thus will always conflict and require user | ||
| # intervention with every merge. To do so, just uncomment the entries below | ||
| ############################################################################### | ||
| #*.sln merge=binary | ||
| #*.csproj merge=binary | ||
| #*.vbproj merge=binary | ||
| #*.vcxproj merge=binary | ||
| #*.vcproj merge=binary | ||
| #*.dbproj merge=binary | ||
| #*.fsproj merge=binary | ||
| #*.lsproj merge=binary | ||
| #*.wixproj merge=binary | ||
| #*.modelproj merge=binary | ||
| #*.sqlproj merge=binary | ||
| #*.wwaproj merge=binary | ||
|
|
||
| ############################################################################### | ||
| # behavior for image files | ||
| # | ||
| # image files are treated as binary by default. | ||
| ############################################################################### | ||
| #*.jpg binary | ||
| #*.png binary | ||
| #*.gif binary | ||
|
|
||
| ############################################################################### | ||
| # diff behavior for common document formats | ||
| # | ||
| # Convert binary document formats to text before diffing them. This feature | ||
| # is only available from the command line. Turn it on by uncommenting the | ||
| # entries below. | ||
| ############################################################################### | ||
| #*.doc diff=astextplain | ||
| #*.DOC diff=astextplain | ||
| #*.docx diff=astextplain | ||
| #*.DOCX diff=astextplain | ||
| #*.dot diff=astextplain | ||
| #*.DOT diff=astextplain | ||
| #*.pdf diff=astextplain | ||
| #*.PDF diff=astextplain | ||
| #*.rtf diff=astextplain | ||
| #*.RTF diff=astextplain | ||
| * text=auto | ||
|
|
||
| ###### Git | ||
| .gitattributes text | ||
| .gitignore text | ||
| .gitconfig text | ||
| .gitmodules text | ||
|
|
||
| ##### Windows | ||
| *.bat text eol=crlf | ||
| *.exe binary | ||
| *.dll binary | ||
|
|
||
| ##### Linux | ||
| *.sh text eol=lf | ||
| *.so binary | ||
|
|
||
| ##### Global | ||
| # Documents | ||
| *.sql text | ||
| *.md text | ||
| *.adoc text | ||
| *.textile text | ||
| *.mustache text | ||
| *.csv text | ||
| *.tab text | ||
| *.tsv text | ||
| *.coffee text | ||
| *.css text | ||
| *.htm text | ||
| *.html text | ||
| *.xhtml text | ||
| *.inc text | ||
| *.js text | ||
| *.jsx text | ||
| *.less text | ||
| *.od text | ||
| *.onlydata text | ||
| *.sass text | ||
| *.scm text | ||
| *.log text | ||
| *.properties text | ||
| *.scss text | ||
| *.styl text | ||
| *.tag text | ||
| *.ts text | ||
| *.tsx text | ||
| *.dockerignore text | ||
| Dockerfile text | ||
| *.markdown text | ||
| *.mdwn text | ||
| *.mdown text | ||
| *.mkd text | ||
| *.mkdn text | ||
| *.mdtxt text | ||
| *.mdtext text | ||
| *.txt text | ||
| AUTHORS text | ||
| CHANGELOG text | ||
| CHANGES text | ||
| CONTRIBUTING text | ||
| COPYING text | ||
| copyright text | ||
| *COPYRIGHT* text | ||
| INSTALL text | ||
| license text | ||
| LICENSE text | ||
| NEWS text | ||
| readme text | ||
| *README* text | ||
| TODO text | ||
| # Configuration | ||
| *.cnf text | ||
| *.cfg text | ||
| *.conf text | ||
| *.config text | ||
| *.ini text | ||
| *.json text | ||
| *.xml text | ||
| *.bowerrc text | ||
| .browserslistrc text | ||
| .editorconfig text | ||
| *.npmignore text | ||
| *.yaml text | ||
| *.yml text | ||
| browserslist text | ||
| Makefile text | ||
| makefile text | ||
| Procfile text | ||
| .slugignore text | ||
| # Linters | ||
| .csslintrc text | ||
| .eslintrc text | ||
| .htmlhintrc text | ||
| .jscsrc text | ||
| .jshintrc text | ||
| .jshintignore text | ||
| .stylelintrc text | ||
| # Video | ||
| *.3gpp binary | ||
| *.3gp binary | ||
| *.as binary | ||
| *.asf binary | ||
| *.asx binary | ||
| *.fla binary | ||
| *.flv binary | ||
| *.m4v binary | ||
| *.mng binary | ||
| *.mov binary | ||
| *.mp4 binary | ||
| *.mpeg binary | ||
| *.mpg binary | ||
| *.ogv binary | ||
| *.swc binary | ||
| *.swf binary | ||
| *.webm binary | ||
| # Audio | ||
| *.kar binary | ||
| *.m4a binary | ||
| *.mid binary | ||
| *.midi binary | ||
| *.mp3 binary | ||
| *.ogg binary | ||
| *.ra binary | ||
| # Graphics | ||
| *.png binary | ||
| *.jpg binary | ||
| *.jpeg binary | ||
| *.gif binary | ||
| *.tif binary | ||
| *.tiff binary | ||
| *.ico binary | ||
| *.eps binary | ||
| *.ai binary | ||
| *.bmp binary | ||
| *.jng binary | ||
| *.jp2 binary | ||
| *.jpx binary | ||
| *.jxr binary | ||
| *.pdf binary | ||
| *.psb binary | ||
| *.psd binary | ||
| *.svg text | ||
| *.svgz binary | ||
| *.wbmp binary | ||
| *.webp binary | ||
| # Archives | ||
| *.7z binary | ||
| *.gz binary | ||
| *.jar binary | ||
| *.rar binary | ||
| *.tar binary | ||
| *.zip binary | ||
| # Fonts | ||
| *.ttf binary | ||
| *.eot binary | ||
| *.otf binary | ||
| *.woff binary | ||
| *.woff2 binary | ||
| # Executables | ||
| *.pyc binary | ||
| # Objects | ||
| *.o binary | ||
|
|
||
| ##### IDE/Editor | ||
| # Visual Studio | ||
| *.sln text eol=crlf | ||
| *.csproj text eol=crlf | ||
| *.vbproj text eol=crlf | ||
| *.vcxproj text eol=crlf | ||
| *.vcproj text eol=crlf | ||
| *.dbproj text eol=crlf | ||
| *.fsproj text eol=crlf | ||
| *.lsproj text eol=crlf | ||
| *.wixproj text eol=crlf | ||
| *.modelproj text eol=crlf | ||
| *.sqlproj text eol=crlf | ||
| *.wmaproj text eol=crlf | ||
| *.xproj text eol=crlf | ||
| *.props text eol=crlf | ||
| *.filters text eol=crlf | ||
| *.vcxitems text eol=crlf | ||
|
|
||
| ##### Language | ||
| # .Net | ||
| *.resx text | ||
| *.settings text | ||
| *.cs text | ||
| *.vb text | ||
| *.cpp text | ||
| *.h text | ||
| *.fs text |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,21 +1,21 @@ | ||
| MIT License | ||
| Copyright (c) 2017 Coin Foundry | ||
| Permission is hereby granted, free of charge, to any person obtaining a copy | ||
| of this software and associated documentation files (the "Software"), to deal | ||
| in the Software without restriction, including without limitation the rights | ||
| to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
| copies of the Software, and to permit persons to whom the Software is | ||
| furnished to do so, subject to the following conditions: | ||
| The above copyright notice and this permission notice shall be included in all | ||
| copies or substantial portions of the Software. | ||
| THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
| IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
| FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
| AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
| LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
| OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE | ||
| SOFTWARE. | ||
| MIT License | ||
|
|
||
| Copyright (c) 2017 Coin Foundry | ||
|
|
||
| Permission is hereby granted, free of charge, to any person obtaining a copy | ||
| of this software and associated documentation files (the "Software"), to deal | ||
| in the Software without restriction, including without limitation the rights | ||
| to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
| copies of the Software, and to permit persons to whom the Software is | ||
| furnished to do so, subject to the following conditions: | ||
|
|
||
| The above copyright notice and this permission notice shall be included in all | ||
| copies or substantial portions of the Software. | ||
|
|
||
| THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
| IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
| FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
| AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
| LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
| OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE | ||
| SOFTWARE. |
Oops, something went wrong.