Skip to content

Commit 11f4b60

Browse files
committed
Merge remote-tracking branch 'upstream/main' into fprime-2966
2 parents 4e12f6d + d7fb2e2 commit 11f4b60

File tree

94 files changed

+8322
-1316
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

94 files changed

+8322
-1316
lines changed

.gitattributes

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# Mark generated reference files as vendored
2+
# This way they are not counted in the source file statistics for the repository,
3+
# but they are included in the version diffs
4+
*.ref.cpp linguist-vendored
5+
*.ref.hpp linguist-vendored
6+
*.ref.h linguist-vendored
7+

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
*.tasty
44
*~
55
.*
6+
!.gitattributes
67
__SHADOW__
78
__pycache__
89
dist/

0 commit comments

Comments
 (0)