diff options
| author | Stephen Dolan <mu@netsoc.tcd.ie> | 2013-05-08 00:52:24 +0100 |
|---|---|---|
| committer | Stephen Dolan <mu@netsoc.tcd.ie> | 2013-05-08 00:52:24 +0100 |
| commit | 2363246eeaa700924279ba288a18b518d570b9ca (patch) | |
| tree | e823504a8991a1cfce4326c0c6b906d7f87058ef /.gitignore | |
| parent | 65deaaacf507c9e1d01773887d8c56be847ff1bd (diff) | |
| parent | dc4d3d8cbee6659ac444cb4696edd9bd8157f6eb (diff) | |
Merge remote-tracking branch 'stagrlee/master' into autotools
Conflicts:
Makefile
jq_test.c
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 5 |
1 files changed, 1 insertions, 4 deletions
@@ -1,13 +1,10 @@ *.o *~ -# Autogenerated -*.gen.* - jq_test build jq jq.1 # Something delightfully recursive happens otherwise -docs/content/2.download/source/*
\ No newline at end of file +docs/content/2.download/source/* |