summaryrefslogtreecommitdiff
path: root/utils
diff options
context:
space:
mode:
authorAustin Foxley <austinf@cetoncorp.com>2010-04-12 06:18:10 -0700
committerAustin Foxley <austinf@cetoncorp.com>2010-04-12 06:18:10 -0700
commit6cc4f58c6382c850ce97f32f56d1a3ff00ca4585 (patch)
tree19a2f25da5db93c2cb620c0da3c38d3bffd0b784 /utils
parentc58dd2b2aabda615aa333cdbb023defbf00b30a3 (diff)
parente90c33f951efc032ca23f48326343a83c0b54b10 (diff)
Merge remote branch 'origin/master' into nptl
Conflicts: libc/unistd/confstr.c Signed-off-by: Austin Foxley <austinf@cetoncorp.com>
Diffstat (limited to 'utils')
-rw-r--r--utils/.gitignore6
1 files changed, 4 insertions, 2 deletions
diff --git a/utils/.gitignore b/utils/.gitignore
index a0ce36637..7cdfa90c1 100644
--- a/utils/.gitignore
+++ b/utils/.gitignore
@@ -1,9 +1,11 @@
+getconf
+getconf.host
+iconv
+iconv.host
ldconfig
ldconfig.host
ldd
ldd.host
-iconv
-iconv.host
locale
locale.host
getconf