Skip to content

Commit 53e8b61

Browse files
authored
Merge branch 'master' into patch-1
2 parents d6ec68f + 42223b3 commit 53e8b61

15 files changed

Lines changed: 54 additions & 26 deletions

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

33
_TODO_
44

5-
**Links to documentation supporting these rule changes:**
5+
**Links to documentation supporting these rule changes:**
66

77
_TODO_
88

9-
If this is a new template:
9+
If this is a new template:
1010

1111
- **Link to application or project’s homepage**: _TODO_

CONTRIBUTING.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,17 @@ high quality, we request that contributions adhere to the following guidelines.
66
- **Provide a link to the application or project’s homepage**. Unless it’s
77
extremely popular, there’s a chance the maintainers don’t know about or use
88
the language, framework, editor, app, or project your change applies to.
9-
9+
1010
- **Provide links to documentation** supporting the change you’re making.
1111
Current, canonical documentation mentioning the files being ignored is best.
1212
If documentation isn’t available to support your change, do the best you can
1313
to explain what the files being ignored are for.
14-
14+
1515
- **Explain why you’re making a change**. Even if it seems self-evident, please
1616
take a sentence or two to tell us why your change or addition should happen.
1717
It’s especially helpful to articulate why this change applies to *everyone*
1818
who works with the applicable technology, rather than just you or your team.
19-
19+
2020
- **Please consider the scope of your change**. If your change specific to a
2121
certain language or framework, then make sure the change is made to the
2222
template for that language or framework, rather than to the template for an

Dart.gitignore

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,19 @@
33
# Files and directories created by pub
44
.dart_tool/
55
.packages
6-
.pub/
76
build/
87
# If you're building an application, you may want to check-in your pubspec.lock
98
pubspec.lock
109

1110
# Directory created by dartdoc
1211
# If you don't generate documentation locally you can remove this line.
1312
doc/api/
13+
14+
# Avoid committing generated Javascript files:
15+
*.dart.js
16+
*.info.json # Produced by the --dump-info flag.
17+
*.js # When generated by dart2js. Don't specify *.js if your
18+
# project includes source files written in JavaScript.
19+
*.js_
20+
*.js.deps
21+
*.js.map

Delphi.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
# Deployment Manager configuration file for your project. Added in Delphi XE2.
2121
# Uncomment this if it is not mobile development and you do not use remote debug feature.
2222
#*.deployproj
23-
#
23+
#
2424
# C++ object files produced when C/C++ Output file generation is configured.
2525
# Uncomment this if you are not using external objects (zlib library for example).
2626
#*.obj

Global/Eclipse.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ local.properties
2323
# CDT-specific (C/C++ Development Tooling)
2424
.cproject
2525

26-
# CDT- autotools
26+
# CDT- autotools
2727
.autotools
2828

2929
# Java annotation processor (APT)

Global/JetBrains.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
# User-specific stuff
55
.idea/**/workspace.xml
66
.idea/**/tasks.xml
7+
.idea/**/usage.statistics.xml
78
.idea/**/dictionaries
89
.idea/**/shelf
910

@@ -14,6 +15,7 @@
1415
.idea/**/sqlDataSources.xml
1516
.idea/**/dynamic.xml
1617
.idea/**/uiDesigner.xml
18+
.idea/**/dbnavigator.xml
1719

1820
# Gradle
1921
.idea/**/gradle.xml

Global/Matlab.gitignore

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77
# Compiled MEX binaries (all platforms)
88
*.mex*
99

10-
# Packaged app and toolbox files
11-
*.mlappinstall
12-
*.mltbx
13-
14-
# Generated helpsearch folders
15-
helpsearch*/
10+
# Packaged app and toolbox files
11+
*.mlappinstall
12+
*.mltbx
13+
14+
# Generated helpsearch folders
15+
helpsearch*/
1616

1717
# Simulink code generation folders
1818
slprj/

Global/SynopsysVCS.gitignore

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,16 @@
44
*.evcd
55
*.fsdb
66

7-
# Default name of the simulation executable. A different name can be
8-
# specified with this switch (the associated daidir database name is
7+
# Default name of the simulation executable. A different name can be
8+
# specified with this switch (the associated daidir database name is
99
# also taken from here): -o <path>/<filename>
1010
simv
1111

1212
# Generated for Verilog and VHDL top configs
1313
simv.daidir/
1414
simv.db.dir/
1515

16-
# Infrastructure necessary to co-simulate SystemC models with
16+
# Infrastructure necessary to co-simulate SystemC models with
1717
# Verilog/VHDL models. An alternate directory may be specified with this
1818
# switch: -Mdir=<directory_path>
1919
csrc/
@@ -22,7 +22,7 @@ csrc/
2222
# used to write all messages from simulation: -l <filename>
2323
*.log
2424

25-
# Coverage results (generated with urg) and database location. The
25+
# Coverage results (generated with urg) and database location. The
2626
# following switch can also be used: urg -dir <coverage_directory>.vdb
2727
simv.vdb/
2828
urgReport/

LabVIEW.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,4 @@
1414
# Metadata
1515
*.aliases
1616
*.lvlps
17+
.cache/

Node.gitignore

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,3 +62,9 @@ typings/
6262

6363
# nuxt.js build output
6464
.nuxt
65+
66+
# vuepress build output
67+
.vuepress/dist
68+
69+
# Serverless directories
70+
.serverless

0 commit comments

Comments
 (0)