diff options
| author | mwturvey <michael.w.turvey@intel.com> | 2017-03-16 10:52:13 -0700 |
|---|---|---|
| committer | mwturvey <michael.w.turvey@intel.com> | 2017-03-16 10:52:13 -0700 |
| commit | ccaa625c6161e14f5c2281cc43134d1928094620 (patch) | |
| tree | c339acbb982d1f2d67977be98a4ae7cac85f8057 /.gitignore | |
| parent | d9c9ebe6de1e6f255d645dd6e641f2c288238bc2 (diff) | |
| parent | 6daf2506fcfbfcd26d63a8bddba319d67ecc33e5 (diff) | |
| download | libsurvive-ccaa625c6161e14f5c2281cc43134d1928094620.tar.gz libsurvive-ccaa625c6161e14f5c2281cc43134d1928094620.tar.bz2 | |
Merge branch 'master' into WinSupport2
# Conflicts:
# src/survive_vive.c
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 11 |
1 files changed, 11 insertions, 0 deletions
@@ -5,3 +5,14 @@ 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 |