summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2010-07-08 15:26:57 (GMT)
committerWaldemar Brodkorb <wbx@openadk.org>2010-07-08 15:26:57 (GMT)
commit643800cee0ad5b853f06056ff90d24efa670f68c (patch)
treed873494ef64659d0cd0a836d2e2dd380d585e5c7 /.gitignore
parent3c70077f308437281c72431223b532f6f427e1d0 (diff)
parent081830a11721ddc097fd2272d4e7ebd47cb7f8dd (diff)
Merge remote branch 'phil/auto-config-in'
Conflicts: Config.in package/dropbear/Makefile package/iptables/Makefile package/kismet/Makefile package/nfs-utils/Makefile package/ntpclient/Makefile package/openvpn/Makefile package/pkgmaker package/rxvt-unicode/Makefile package/vgp/Makefile package/wpa_supplicant/Makefile package/xf86-input-keyboard/Makefile package/xf86-input-mouse/Makefile
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore2
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index c8089da..21e9fb3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,6 +29,8 @@ config/*.o
config/lxdialog/*.o
make.log
dl/
+package/Config.in.auto*
+package/pkgconfigs.d/
package/*/info.mk
package/*/Config.in
package/*/Config.in.lib