diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2013-04-29 15:07:03 +0200 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2013-04-29 15:07:03 +0200 |
| commit | 64a5350500baf0db90dca6a753ab6e6ece52043d (patch) | |
| tree | d95e4b6c88f8358635e1b315154ea3347fe3928b /facetracknoir/ftnoir_keyboardshortcuts.ui | |
| parent | 9afe47d68063ca48dad4164bf138a900c7acd9e7 (diff) | |
| parent | 2f2d8d212a56928dea91dcf474caf68120d77ac4 (diff) | |
Merge branch 'master' of github.com:sthalik/facetracknoir-posix into posix
Conflicts:
bin/tracker-ht/headtracker-ftnoir.exe
ftnoir_tracker_ht/ftnoir_tracker_ht.cpp
Diffstat (limited to 'facetracknoir/ftnoir_keyboardshortcuts.ui')
0 files changed, 0 insertions, 0 deletions