AndrewMeadows e34f592a83 Merge pull request #3132 from birarda/master ... fix stubbing of MIDIManager if HAVE_RTMIDI not defined		2014-07-08 10:36:05 -07:00
..
external	Merge branch 'master' of https://github.com/highfidelity/hifi	2014-07-03 09:25:03 -07:00
resources	Merge branch 'master' of https://github.com/highfidelity/hifi	2014-07-02 13:12:37 -07:00
src	Merge pull request #3132 from birarda/master	2014-07-08 10:36:05 -07:00
ui	Merge pull request #3108 from huffman/19800	2014-07-02 15:46:56 -07:00
CMakeLists.txt	resolve conflicts on merge with upstream master	2014-07-01 11:02:25 -07:00
interface.icns	update the interface icon	2014-07-07 11:46:57 -07:00
interface_en.ts	Merge branch master	2014-04-24 18:52:59 +05:30
InterfaceConfig.h.in
InterfaceVersion.h.in