Stephen Birarda d4f2c9e631 Merge branch 'master' of https://github.com/highfidelity/hifi into authentication		2014-04-09 14:40:14 -07:00
..
external	slightly different approach to windows warning fix	2014-03-15 21:30:45 -07:00
resources	Modify icons in Interface "mirror"	2014-04-09 18:54:59 +02:00
src	Merge branch 'master' of https://github.com/highfidelity/hifi into authentication	2014-04-09 14:40:14 -07:00
ui	Manual merge	2014-04-02 18:07:55 -07:00
CMakeLists.txt	resolve conflicts on merge with upstream master	2014-04-07 09:32:08 -07:00
interface.icns
InterfaceConfig.h.in
InterfaceVersion.h.in