summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Silverstone <dsilvers@digital-scurf.org>2013-04-20 14:56:48 +0100
committerDaniel Silverstone <dsilvers@digital-scurf.org>2013-04-20 14:56:48 +0100
commit72d2bb3371a690d76a18bcc936028e0694f5ebeb (patch)
treee3c7bb12550a2d8b741c8ab99df864c44afcebd6
parent076361e1e146e56b901f926b7d581d383709d4a2 (diff)
parent3234d06ded5dc97e2866b42e5eb96b4c76c98cf2 (diff)
downloadnetsurf-72d2bb3371a690d76a18bcc936028e0694f5ebeb.tar.gz
netsurf-72d2bb3371a690d76a18bcc936028e0694f5ebeb.tar.bz2
Merge release in, but do not change version.c
-rw-r--r--.gitattributes2
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 000000000..de2f3167a
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,2 @@
+.gitignore export-ignore
+.gitattributes export-ignore