David Rowe afce981d83 Merge branch 'master' into 20530 ... Conflicts: interface/src/Application.cpp interface/src/devices/DdeFaceTracker.cpp interface/src/devices/DdeFaceTracker.h		2015-05-06 16:27:33 -07:00
..
external
icon
resources	Merge pull request #4701 from jherico/infoview	2015-05-06 12:12:21 -07:00
src	Merge branch 'master' into 20530	2015-05-06 16:27:33 -07:00
ui
CMakeLists.txt
interface_en.ts
InterfaceConfig.h.in
InterfaceVersion.h.in