summaryrefslogtreecommitdiff
path: root/m4
diff options
context:
space:
mode:
authorThomas Graf <tgr@lsx.localdomain>2009-09-02 23:41:03 +0200
committerThomas Graf <tgr@lsx.localdomain>2009-09-02 23:41:03 +0200
commitf946cfaa3a45e4c5752e3930e8383196aae85399 (patch)
tree2d5c064f62ce353a4bb387bf244508c3bcd66e53 /m4
parent2ead49f0d5873628156e50dfed7da14619a4172d (diff)
parenta73e5f92c378e96458ae88a3dc07514ee5856987 (diff)
downloadlibnl-f946cfaa3a45e4c5752e3930e8383196aae85399.tar.gz
Merge branch 'master' of git://dev.medozas.de/libnl
Conflicts: lib/Makefile src/Makefile
Diffstat (limited to 'm4')
-rw-r--r--m4/.gitignore2
1 files changed, 2 insertions, 0 deletions
diff --git a/m4/.gitignore b/m4/.gitignore
new file mode 100644
index 0000000..8d0c756
--- /dev/null
+++ b/m4/.gitignore
@@ -0,0 +1,2 @@
+/lt*.m4
+/libtool.m4