summaryrefslogtreecommitdiffstats
path: root/epan/.editorconfig
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-09-19 04:14:33 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-09-19 04:14:33 +0000
commit9f153fbfec0fb9c9ce38e749a7c6f4a5e115d4e9 (patch)
tree2784370cda9bbf2da9114d70f05399c0b229d28c /epan/.editorconfig
parentAdding debian version 4.2.6-1. (diff)
downloadwireshark-9f153fbfec0fb9c9ce38e749a7c6f4a5e115d4e9.tar.xz
wireshark-9f153fbfec0fb9c9ce38e749a7c6f4a5e115d4e9.zip
Merging upstream version 4.4.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'epan/.editorconfig')
-rw-r--r--epan/.editorconfig8
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/.editorconfig b/epan/.editorconfig
index 238b185a..976182a6 100644
--- a/epan/.editorconfig
+++ b/epan/.editorconfig
@@ -77,10 +77,6 @@ indent_size = tab
indent_style = tab
indent_size = tab
-[ipv4.[ch]]
-indent_style = tab
-indent_size = tab
-
[next_tvb.[ch]]
indent_size = 2
@@ -120,6 +116,10 @@ indent_size = tab
indent_style = tab
indent_size = tab
+[stats_tree_priv.h]
+indent_style = tab
+indent_size = tab
+
[t35.[ch]]
indent_style = tab
indent_size = tab