diff options
| author | toni <matzeton@googlemail.com> | 2016-07-04 15:36:07 +0200 |
|---|---|---|
| committer | toni <matzeton@googlemail.com> | 2016-07-04 15:36:07 +0200 |
| commit | cb6047b694a86f78723a613819677227f14e30c3 (patch) | |
| tree | 4eb9c2f2339c5185fec81447bd832d4d4f0bd3d0 /.gitignore | |
| parent | 7248ec097b19828e047e83df89aa7bac4150c2cd (diff) | |
| parent | bc30ed7f5624f7d5ccc1e9937ed7bcb7faae9892 (diff) | |
Merge branch 'master' into jessie
Conflicts:
main.c
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -1,2 +1,3 @@ -/naskpass *.swp +*.o +*.d |