aboutsummaryrefslogtreecommitdiff
path: root/build-aux
diff options
context:
space:
mode:
authorMarcoFalke <falke.marco@gmail.com>2015-10-09 11:36:59 +0200
committerMarcoFalke <falke.marco@gmail.com>2015-10-09 11:36:59 +0200
commit313e7f5c89d6e72e06efe9255089765b4c5815fe (patch)
tree259c34c09fea315ca8ac9efd61111e6321c315cb /build-aux
parent2f9f082b5ef3c495c70598ef23383effef675f9a (diff)
Squashed 'src/univalue/' changes from 87d9045..5839ac3
5839ac3 Merge pull request #13 from theuni/move-lib 3f248e0 build: move libunivalue.la to the root dir a68aed5 Merge pull request #12 from jmcorgan/add-ignores 81cafe3 Update and consolidate git ignores git-subtree-dir: src/univalue git-subtree-split: 5839ac3311792f80b9cd5070440c2256e0e69e13
Diffstat (limited to 'build-aux')
-rw-r--r--build-aux/m4/.empty0
-rw-r--r--build-aux/m4/.gitignore1
2 files changed, 1 insertions, 0 deletions
diff --git a/build-aux/m4/.empty b/build-aux/m4/.empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/build-aux/m4/.empty
+++ /dev/null
diff --git a/build-aux/m4/.gitignore b/build-aux/m4/.gitignore
new file mode 100644
index 0000000000..f063686524
--- /dev/null
+++ b/build-aux/m4/.gitignore
@@ -0,0 +1 @@
+/*.m4