diff options
| author | Kali Kaneko <kali@leap.se> | 2016-04-25 21:32:54 -0400 |
|---|---|---|
| committer | Kali Kaneko <kali@leap.se> | 2016-04-25 21:32:54 -0400 |
| commit | 434d0534661d7c222e5dabc4e5e237b060d2212b (patch) | |
| tree | 2e7bf0e556f983bd5404481a9aa4fb0fd7d75778 /.gitignore | |
| parent | 9ee728108f3b894d097206cc6ff6d0a70808f2d5 (diff) | |
| parent | f47416804ad2f88ba27aa032e0d2fc1c9fd314c8 (diff) | |
Merge branch 'develop' into debian/experimental
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -15,7 +15,6 @@ ui_*.py !.gitattributes bin/ build/ -core dist/ docs/_build docs/covhtml @@ -39,3 +38,4 @@ data/bitmask.pro bitmask-resources.png docker/data +leap_thirdparty_build |