David Rowe 8a3c8e0d9a Merge branch 'master' into 20532 ... Conflicts: interface/src/devices/DdeFaceTracker.cpp		2015-05-12 17:41:12 -07:00
..
external	remove visage related files	2015-04-17 13:40:31 -07:00
icon	fix check for debug/release icon	2015-01-30 15:41:44 -08:00
resources	Merge pull request #4701 from jherico/infoview	2015-05-06 12:12:21 -07:00
src	Merge branch 'master' into 20532	2015-05-12 17:41:12 -07:00
ui	Better preference description	2015-05-11 17:19:50 -07:00
CMakeLists.txt	add a macro to recursively correctly handle resources	2015-04-27 16:02:52 -07:00
interface_en.ts
InterfaceConfig.h.in
InterfaceVersion.h.in