Merge remote branch 'refs/remotes/origin/terencehill/misc_bugfixes'

[xonotic/xonotic-data.pk3dir.git] / .gitattributes

diff --git a/.gitattributes b/.gitattributes
index fb9e9b14c20bf4ae9a2761ec1a61a5f628ce27a0..695d07e57d3951ba52488fca29bfe159de8a399e 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -76,6 +76,7 @@ GPL crlf=input
 *.icns -crlf -diff
 *.ico -crlf -diff
 *.idsoftware crlf=input
+*.iqm -crlf -diff
 *.inc crlf=input
 *.instantaction crlf=input
 *.java crlf=input