diff options
| author | Joshua Allen <axlecrusher@gmail.com> | 2017-03-15 19:26:46 -0400 |
|---|---|---|
| committer | Joshua Allen <axlecrusher@gmail.com> | 2017-03-15 19:26:46 -0400 |
| commit | 1388d54117ff780b7fadd4fd682b6def569838fa (patch) | |
| tree | 3737760c889eeaf0bd7305becc943d859ae65d96 /.gitignore | |
| parent | 62cef8aec06638bd006eaef46700f491750fc108 (diff) | |
| parent | 9bd0a0d949639b516d28091f57862ac5e59e65da (diff) | |
| download | libsurvive-1388d54117ff780b7fadd4fd682b6def569838fa.tar.gz libsurvive-1388d54117ff780b7fadd4fd682b6def569838fa.tar.bz2 | |
Merge branch 'master' of github.com:cnlohr/libsurvive
Conflicts:
src/survive_data.c
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -1,3 +1,7 @@ *.o lib test +windows/calibrate.exe +windows/calinfo/1.json.gz +windows/calibrate.def +windows/calinfo/3.json.gz |