diff options
author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-06-15 16:31:13 -0400 |
---|---|---|
committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-06-15 16:31:13 -0400 |
commit | 1a435c0f4b41904025d0f263734cb9aea6a03b13 (patch) | |
tree | 96ce607542c806c4a99c0463c3fea534e4c8e424 /.gitignore | |
parent | 043466d94da837fefb95cda8ecab44b03049890d (diff) | |
parent | e4b972f3c82dbe4b5e363e48ed01d97cc060a2c0 (diff) |
Merge remote-tracking branch 'hackers/parabola-hackers'
# Conflicts:
# .gitignore
Diffstat (limited to '.gitignore')
-rw-r--r-- | .gitignore | 8 |
1 files changed, 7 insertions, 1 deletions
@@ -1,5 +1,5 @@ /pkg -/bin +/bin/nshd /src/*.*/ /nshd.service /nshd.socket @@ -7,3 +7,9 @@ .tmp.* /LICENSE.*.txt *.o + +*~ +output/ +cache/ +parabola-keyring-*.tar.gz + |