diff options
| author | mwturvey <michael.w.turvey@intel.com> | 2017-03-17 14:41:59 -0700 |
|---|---|---|
| committer | mwturvey <michael.w.turvey@intel.com> | 2017-03-17 14:41:59 -0700 |
| commit | b6981854dff11022e3de56e56cbf4633f1c49598 (patch) | |
| tree | f5b8f4ff1425f704d791d5b9af9c8af65455868d /.gitignore | |
| parent | 94be8ccdbfb2f44c9bc569428537444030ba8eeb (diff) | |
| parent | a53c520c2d1a3bb9faa4cb5e4ee9ccc48bb1835f (diff) | |
| download | libsurvive-b6981854dff11022e3de56e56cbf4633f1c49598.tar.gz libsurvive-b6981854dff11022e3de56e56cbf4633f1c49598.tar.bz2 | |
Merge branch 'master' into UsbTrackerOnWin
# Conflicts:
# src/survive_vive.c
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 32 |
1 files changed, 17 insertions, 15 deletions
@@ -1,18 +1,20 @@ *.o lib test -windows/calibrate.exe -windows/calinfo/1.json.gz -windows/calibrate.def -windows/calinfo/3.json.gz -windows/calinfo/WM1_points.csv -windows/calinfo/HMD_normals.csv -windows/calinfo/WM0_points.csv -windows/calinfo/WM1_normals.csv -windows/calinfo/HMD_points.csv -windows/calinfo/WM0_normals.csv -windows/calinfo/2.json.gz -windows/calinfo - Copy/WM1_points.csv -windows/udev[USB_DEV_LIGHTHOUSE] -windows/udev[USB_DEV_LIGHTHOUSE] -windows/config.json +winbuild/calibrate.exe +winbuild/calinfo/* +winbuild/calibrate.def +winbuild/udev[USB_DEV_LIGHTHOUSE] +winbuild/config.json +winbuild/x64/* +winbuild/calibrate/calinfo/* +winbuild/calibrate/config.json +winbuild/calibrate/x64/* +winbuild/libsurvive/x64/* +winbuild/.vs/* +*.user +*.ipch +winbuild/.vs/libsurvive/v15/.suo +*.tlog +winbuild/calibrate.exe +winbuild/calibrate.def |