diff options
| author | Donovan Baarda <abo@minkirri.apana.org.au> | 2014-10-15 14:07:20 +1100 |
|---|---|---|
| committer | Donovan Baarda <abo@minkirri.apana.org.au> | 2014-10-15 14:07:20 +1100 |
| commit | dbd04e283082ab869a22abf03c4c6280b03935bb (patch) | |
| tree | 3951c6f91f76047e655f35e04db4eecd576c49df /facetracknoir/clientfiles/cute-octopus-vector-material_15-1831.jpg | |
| parent | d880464fbe9180aefde94594330126e115066dc3 (diff) | |
| parent | 051a2e4392bc75b246cc5cb897ae0bbb1f92042e (diff) | |
Merge branch 'unstable' of https://github.com/opentrack/opentrack into dev/kalman
Conflicts:
ftnoir_filter_kalman/ftnoir_filter_kalman.h
Diffstat (limited to 'facetracknoir/clientfiles/cute-octopus-vector-material_15-1831.jpg')
| -rw-r--r-- | facetracknoir/clientfiles/cute-octopus-vector-material_15-1831.jpg | bin | 0 -> 71514 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/facetracknoir/clientfiles/cute-octopus-vector-material_15-1831.jpg b/facetracknoir/clientfiles/cute-octopus-vector-material_15-1831.jpg Binary files differnew file mode 100644 index 00000000..c4e5318f --- /dev/null +++ b/facetracknoir/clientfiles/cute-octopus-vector-material_15-1831.jpg |