Skip to content

Commit 6332bf1

Browse files
authored
Merge branch 'main' into driver-refactor
2 parents 2cf4622 + ebc0739 commit 6332bf1

File tree

132 files changed

+5902
-9153
lines changed

Some content is hidden

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

132 files changed

+5902
-9153
lines changed

.gitattributes

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,3 +36,6 @@ LICENSE text eol=lf
3636

3737
# System description files
3838
*.svd eol=lf
39+
40+
# JSON
41+
*.json eol=lf

.gitignore

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,12 @@ tools/ct_data/v2p.txt
4747
/emulation/linux-server-rootfs.jffs2
4848

4949
# don't record weirdnesses dealing with vscode
50-
/.vscode/
51-
/.vs/
50+
.vscode
51+
.vs
52+
settings.json
53+
54+
# Emacs backup files
55+
*~
5256

5357
# don't commit local modifications to the Renode filesystem template
5458
emulation/linux-server-rootfs.jffs2
@@ -74,4 +78,5 @@ share/python-wheels/
7478
*.egg-info/
7579
.installed.cfg
7680
*.egg
81+
*.pyc
7782
MANIFEST

0 commit comments

Comments
 (0)