chiark / gitweb /
~ianmdlvl / adns.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from parent 2: 53057d8)
Merge remote-tracking branch 'mdw/mdw/convert-script'
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Wed, 30 Apr 2014 17:34:39 +0000 (18:34 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Wed, 30 Apr 2014 17:36:21 +0000 (18:36 +0100)
"iwj's original" 8298cc36e3a7eef91f722e7115ea8b5a9366fb55
is actually identical to 8e04e8e83b27a61d1471c81de5f8aabe29dda30a
apart from the .gitignore

Conflicts:
convert

.gitignore [new file with mode: 0644] patch | blob

diff --git a/.gitignore b/.gitignore
new file mode 100644 (file)
index 0000000..b25c15b
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+*~
adns master upstream repository