diff options
| author | Micah Anderson <micah@riseup.net> | 2013-08-27 12:20:29 -0400 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2013-08-27 12:20:29 -0400 |
| commit | 4951157e3740b42ecef6775c8927b912a6ee8870 (patch) | |
| tree | 00e7bf6c9d14106c8b06dd030b90d130fa8c40bd /.gitignore | |
| parent | 1b4458bfc2ce97ec02180793eca0fcca38be4f84 (diff) | |
| parent | 5997cb2c8c2aa2af18079f9a9505731f498fb9a4 (diff) | |
Merge remote-tracking branch 'leapcode/debian' into debian
Conflicts:
MANIFEST.in
debian/changelog
debian/copyright
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 8 |
1 files changed, 7 insertions, 1 deletions
@@ -11,7 +11,6 @@ ui_*.py bin/ build/ core -debian/python-leap-client/ dist/ docs/_build docs/covhtml @@ -32,3 +31,10 @@ MANIFEST _trial_temp* config/* CHANGELOG~ +debian/bitmask.postinst.debhelper +debian/bitmask.postrm.debhelper +debian/bitmask.prerm.debhelper +debian/bitmask.substvars +debian/bitmask/ +debian/files +docs/man/bitmask.1 |