summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorStephane Glondu <steph@glondu.net>2019-08-20 11:14:30 +0200
committerStephane Glondu <steph@glondu.net>2019-08-20 11:14:30 +0200
commit5c3452d8a43e801580493edabb79538d854ff77a (patch)
tree9882cc06ad5b2e3d72a4b301816a5bb2ff7a83d3 /.gitignore
parentd09b1bf50d413215c6b4c605e058a67539f49b80 (diff)
New upstream version 4.3
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 93a6523..9c20a58 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ _build
*.install
pkg/META
src_test/_tags
+.merlin \ No newline at end of file