summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Jordan <mjordan@digium.com>2015-04-14 12:25:56 -0500
committerGerrit Code Review <gerrit2@gerrit.digium.api>2015-04-14 12:25:56 -0500
commit941512e588501bcaec38e2295bf22ac90b6cc365 (patch)
tree99bd3ce0bba4b3358eb2688d219f7844fa3a4ade
parent9f5ba58332119dd283eed3d202b0a64aa0394f12 (diff)
parentbf46ef35cab9733a6565004f6c30280256b5c72e (diff)
Merge ".gitignore updates for master/13"
-rw-r--r--.gitignore4
-rw-r--r--menuselect/.gitignore2
2 files changed, 5 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index 33dd7cc55..063651091 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,10 +18,12 @@
*.moduleinfo
*.makeopts
*.makedeps
-makeopts
.lastclean
+aclocal.m4
+autom4te.cache
config.log
config.status
defaults.h
+makeopts
makeopts.embed_rules
menuselect-tree
diff --git a/menuselect/.gitignore b/menuselect/.gitignore
index 38ea2d3a1..ded8d2d6e 100644
--- a/menuselect/.gitignore
+++ b/menuselect/.gitignore
@@ -3,3 +3,5 @@ cmenuselect
config.log
config.status
menuselect
+gmenuselect
+nmenuselect