diff options
| author | James Booth <boothj5@gmail.com> | 2015-06-05 23:02:56 +0100 |
|---|---|---|
| committer | James Booth <boothj5@gmail.com> | 2015-06-05 23:02:56 +0100 |
| commit | 9aff8abd2ed405e2790bb3918834ef501542d4f5 (patch) | |
| tree | f78d54491b01c2c8d259f37459ad2229e6919d71 /.gitignore | |
| parent | a3693cfbe744c6ba8274b56a437f1faaaad414bf (diff) | |
| parent | ae4e07ad87968072893b58c2ee778b52fc3059da (diff) | |
| download | profani-tty-9aff8abd2ed405e2790bb3918834ef501542d4f5.tar.gz | |
Merge branch 'master' into openpgp
Conflicts: .travis.yml
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index ba909849..03e0adef 100644 --- a/.gitignore +++ b/.gitignore @@ -69,3 +69,8 @@ callgrind.out.* gen_docs.sh main_fragment.html toc_fragment.html +unittests/unittests +unittests/unittests.trs +functionaltests/functionaltests +functionaltests/functionaltests.trs + |