Brad Hefta-Gaub 85363f6603 Merge branch 'master' of git://github.com/worklist/hifi into juridiction_improvements		2014-01-22 14:23:00 -08:00
..
external	Merge branch 'windows_build' of https://github.com/ZappoMan/hifi into windows_build	2014-01-16 14:33:44 -08:00
resources	Merge branch 'master' of github.com:/worklist/hifi	2014-01-17 13:06:59 -06:00
src	Merge branch 'master' of git://github.com/worklist/hifi into juridiction_improvements	2014-01-22 14:23:00 -08:00
CMakeLists.txt	changing dev version	2014-01-17 14:02:57 -06:00
interface.icns	update to newer interface icon	2013-05-15 14:43:35 -07:00
InterfaceConfig.h.in	Adding build sequence to Interface build	2013-12-16 11:03:49 -06:00
InterfaceVersion.h.in	Checkpoint	2014-01-13 07:37:47 -06:00