summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Abd-El-Malek <jabdelmalek@google.com>2014-05-23 17:46:18 -0700
committerJohn Abd-El-Malek <jabdelmalek@google.com>2014-05-23 17:46:18 -0700
commit5b51e49beb646a378f5cbaf012ff63c982345e66 (patch)
tree90d91355e4b0e35bbe85516ff05c765026c6b678
parent3f3b45cc74b0499912409f766a595945dbbfc4c5 (diff)
downloadpdfium-5b51e49beb646a378f5cbaf012ff63c982345e66.tar.xz
Add a .gitattributes with "* text=auto" so that new lines are
automatically converted to the native platform's format on checkout but are committed as "LF". BUG=375516 Original patch from Julien Tinnes <jln@chromium.org>
-rw-r--r--.gitattributes1
-rw-r--r--AUTHORS1
2 files changed, 2 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000000..176a458f94
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+* text=auto
diff --git a/AUTHORS b/AUTHORS
index d5c3fc7aaf..45e878a849 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -9,6 +9,7 @@
# See python fnmatch module documentation for more information.
John Abd-El-Malek <jam@chromium.org>
+Julien Tinnes <jln@chromium.org>
Matt Giuca <mgiuca@chromium.org>
Nico Weber <thakis@chromium.org>
Raymes Khoury <raymes@chromium.org>