diff options
| author | Kali Kaneko <kali@leap.se> | 2013-10-30 16:33:41 -0200 |
|---|---|---|
| committer | Kali Kaneko <kali@leap.se> | 2013-10-30 16:33:41 -0200 |
| commit | 8766b396cb7faf84c6eab3b2516229c791fe2e90 (patch) | |
| tree | 7fae4c8ae7119d58c98ecc8c13b6ad3d2a009a77 /.gitignore | |
| parent | f22b1a04f892857d162d87f9c9e120e7c5daadf7 (diff) | |
| parent | a06b5719f028e619a4b3800fb346ed3c984e4d25 (diff) | |
Merge tag '0.3.5' into debian
Tag leap.bitmask version 0.3.5
Conflicts:
.gitignore
pkg/requirements.pip
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 9 |
1 files changed, 2 insertions, 7 deletions
@@ -29,10 +29,5 @@ 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 + +data/bitmask.pro |