diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-04-17 10:45:45 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-04-17 10:45:45 -0400 |
| commit | a79d7c7251f4e6fd2f8b288b5c91a77a66ecff65 (patch) | |
| tree | f44145d6cda8bb20070edf1ce464ad60b6bf3a04 /.gitignore | |
| parent | f73a4a8844641b780644b8b96865372dc34936bd (diff) | |
| parent | 752bd700e9da464006bfbd9877cc858dfad545ba (diff) | |
Merge branch 'lukeshu/xbs' into testmerge
# Conflicts:
# test/lib/common.inc
# test/test.d/create-filelists.sh
# test/test.d/db-move.sh
# test/test.d/db-remove.sh
# test/test.d/db-repo-add.sh
# test/test.d/db-repo-remove.sh
# test/test.d/db-update.sh
# test/test.d/ftpdir-cleanup.sh
# test/test.d/sourceballs.sh
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 6 |
1 files changed, 6 insertions, 0 deletions
@@ -1,3 +1,9 @@ *~ +*.pyc /config.local test/packages/*/*.pkg.tar.?z +\#*# +.#* +yftime +src* +pkg* |