Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging

[mirror_qemu.git] / .editorconfig

diff --git a/.editorconfig b/.editorconfig
index 158288339385d916b072417e606acdbaab6da856..a001f340bd8be482016d1f62a00913cf5b765b2b 100644 (file)
--- a/.editorconfig
+++ b/.editorconfig
@@ -26,6 +26,15 @@ file_type_emacs = makefile
 indent_style = space
 indent_size = 4
 
+[*.sh]
+indent_style = space
+indent_size = 4
+
+[*.{s,S}]
+indent_style = tab
+indent_size = 8
+file_type_emacs = asm
+
 [*.{vert,frag}]
 file_type_emacs = glsl