summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTor Andersson <tor.andersson@artifex.com>2016-07-13 16:15:51 +0200
committerTor Andersson <tor.andersson@artifex.com>2016-07-14 00:49:56 +0200
commitb8aeced92d5a3576e9bc5fbd87656dc97e380c52 (patch)
tree0b2ada76b0126c0b0f49867ed582e3e52edcf21d
parent37071d23919bbe857bb6770a1637776c36e858ac (diff)
downloadmupdf-b8aeced92d5a3576e9bc5fbd87656dc97e380c52.tar.xz
Add editorconfig and update gitattributes.
-rw-r--r--.editorconfig13
-rw-r--r--.gitattributes17
2 files changed, 25 insertions, 5 deletions
diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 00000000..0ffcd965
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,13 @@
+# editorconfig.org settings for mupdf project
+
+root = true
+
+[*]
+indent_style = tab
+insert_final_newline = true
+trim_trailing_whitespace = true
+end_of_line = lf
+
+[memento.*]
+indent_style = space
+indent_size = 4
diff --git a/.gitattributes b/.gitattributes
index 9b84244c..824a119d 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -2,15 +2,22 @@
[attr]tabs whitespace=trailing-space,space-before-tab,indent-with-non-tab,tabwidth=4
[attr]spaces whitespace=trailing-space,space-before-tab,tabs-in-indent
-# Files:
+# Source files:
* text=auto
Make* tabs
*.mk tabs
*.[chm] tabs
*.java tabs
*.xml tabs
-build.xml spaces
+
+# Documentation files:
+*.txt spaces
+[A-Z]* spaces
+
+# Legacy source files:
memento.* spaces
-*.vcxproj* spaces
-jmem* spaces
-*.gradle spaces
+
+# iOS project files:
+*.xib spaces
+*.xcscheme spaces
+*.json spaces