summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorMichael Vogt <mvo@debian.org>2013-11-29 13:39:45 +0100
committerMichael Vogt <mvo@debian.org>2013-11-29 13:39:45 +0100
commite4a93f90b2e50f6833f7146496e574a5a9cedaca (patch)
tree836dd5e70b394f9996d4af0bdfcd52d2a388a007 /.gitignore
parentfdef7c5e3a19c5f35ee952598124d0fe8d03c7ec (diff)
parentfaeb435cab7b41a50c621ef9f96853d15c57d0d8 (diff)
Merge remote-tracking branch 'mvo/debian/sid' into debian/sid
Conflicts: apt-private/private-cmndline.cc
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions