diff options
| author | Florian Bruhin <git@the-compiler.org> | 2015-07-26 15:08:58 +0200 |
|---|---|---|
| committer | Florian Bruhin <git@the-compiler.org> | 2015-07-26 15:08:58 +0200 |
| commit | b52a41ac6fc262421aeb612d9faaf74a48b8811b (patch) | |
| tree | 809f91ada0580f2abdc28713298c08c64c8a5e3d /.gitignore | |
| parent | c750ff3f507b56a12861a252994b001166b82708 (diff) | |
| parent | 91561e2c5b50de23b140e2b19843687ea853f536 (diff) | |
| download | qutebrowser-b52a41ac6fc262421aeb612d9faaf74a48b8811b.tar.gz qutebrowser-b52a41ac6fc262421aeb612d9faaf74a48b8811b.zip | |
Merge branch 'master' of https://github.com/antoyo/qutebrowser into antoyo-master
Conflicts:
.gitignore
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index d71a7a16b..cc23379f9 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ __pycache__ *.pyc +*.swp /build /dist /qutebrowser.egg-info @@ -26,3 +27,4 @@ __pycache__ /.cache /.testmondata /.hypothesis +TODO |