summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorMichael Vogt <mvo@debian.org>2014-06-12 08:36:58 +0200
committerMichael Vogt <mvo@debian.org>2014-06-12 08:36:58 +0200
commitcfc7f735774ba30dbee1897248f8dfedf0229a4c (patch)
treeb4e0ac29a6b398045a803e890f5cdabcca189d6a /.gitignore
parenta0187f0f82a184b850b05b62e5a59b6a2055a506 (diff)
parent7701680af12a2c1a65121533c6ebcd635c013c25 (diff)
Merge tag '1.0.1ubuntu2' into ubuntu/trusty
Conflicts: configure.ac debian/changelog debian/control test/integration/framework
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore5
1 files changed, 3 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore
index 69a229c3e..488682ee7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,9 +35,10 @@
/cmdline/apt-key
/doc/apt-vendor.ent
/doc/examples/sources.list
+/debian/apt.install
/debian/libapt-pkg*.install
/debian/libapt-inst*.install
/debian/libapt-pkg-dev.install
/vendor/current
-/vendor/debian/sources.list
-/vendor/ubuntu/sources.list
+/vendor/*/sources.list
+/vendor/*/makefile.auto