Skip to content

Commit 3d036bb

Browse files
committed
Merge remote-tracking branch 'origin/develop' into develop
# Conflicts: # plugin/changelog.md
2 parents c03333e + 099c7b5 commit 3d036bb

File tree

11 files changed

+4
-4
lines changed

11 files changed

+4
-4
lines changed

icons/data/languages/c.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,3 @@ match:
55
extension:
66
equals:
77
- .c
8-
- .h

icons/data/languages/h.yaml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
name: H
1+
name: "H\u200b"
22
asset: h
33
parent: text
44
match:
55
extension:
66
equals:
7-
# Disabled due to conflict with C headers
8-
# - .h
7+
- .h
98
- .objh

icons/data/languages/visualbasic.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ match:
99
- .frx # (form - binary information)
1010
- .ctl # (custom control)
1111
- .ctx # (custom control binary information)
12+
- .vb # (Visual Basic.NET file)
1213
- .vbp # (project)
1314
- .vbg # (project group)
1415
- .bas # (module)
18.9 KB
Loading
27 KB
Loading
30.9 KB
Loading
95.9 KB
Loading
21.4 KB
Loading
File renamed without changes.
32.5 KB
Loading

0 commit comments

Comments
 (0)