Philip Rosedale 7b55ee31a3 Merge branch 'master' of https://github.com/worklist/hifi		2014-02-27 16:01:04 -08:00
..
external	We need the dependencies, too.	2014-02-11 17:03:24 -08:00
resources	resolve conflicts on merge with upstream master	2014-02-21 15:16:15 -08:00
src	Merge branch 'master' of https://github.com/worklist/hifi	2014-02-27 16:01:04 -08:00
ui
CMakeLists.txt	Merge remote-tracking branch 'upstream/master'	2014-02-20 23:32:06 -05:00
interface.icns
InterfaceConfig.h.in
InterfaceVersion.h.in