summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkali <kali@leap.se>2012-08-10 00:39:39 +0900
committerkali <kali@leap.se>2012-08-10 00:39:39 +0900
commitbe679d02d77c8a42e78746285cf2e832ca8259b6 (patch)
treed6fa72ceb97aab45c160c1f45a0fd69db505c54b
parent305e7ebe7b9de5911114590ca92a4769012b8568 (diff)
parentb06e938d688c89bfb4529ff593672e726403e152 (diff)
Merge branch 'upstream' into debian
-rw-r--r--.gitattributes2
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..5966153
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,2 @@
+.gitattributes export-ignore
+.gitignore export-ignore