diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2014-10-14 23:09:46 +0200 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2014-10-14 23:09:46 +0200 |
| commit | 051a2e4392bc75b246cc5cb897ae0bbb1f92042e (patch) | |
| tree | 37b27e0933e8e0d2ac9731b7c0d2fb92c3d59661 /ftnoir_tracker_pt/Resources/cap_side.png | |
| parent | 585ab39e477faac19df0ec8ae4595905a9d671c3 (diff) | |
| parent | 14f59d9fe5f1926a8562efc8a51a785365bc0131 (diff) | |
Merge branch 'flush-20141005' into unstable
* flush-20141005:
aruco: fix fixating on the prev marker location
drop guard, only relevant in direct/blockingqueued
Diffstat (limited to 'ftnoir_tracker_pt/Resources/cap_side.png')
0 files changed, 0 insertions, 0 deletions