Andrzej Kapolka 09677b06f2 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels ... Conflicts: assignment-client/src/metavoxels/MetavoxelServer.cpp		2014-02-20 12:05:15 -08:00
..
external	We need the dependencies, too.	2014-02-11 17:03:24 -08:00
resources	Added style and pngs for the buttons	2014-02-19 16:01:14 -08:00
src	Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels	2014-02-20 12:05:15 -08:00
ui	repair the UpdateDialog so it is a QDialog with no child QWidget	2014-01-22 14:17:56 -08:00
CMakeLists.txt	We need libc++, not libc++abi.	2014-02-19 12:03:14 -08:00
interface.icns
InterfaceConfig.h.in
InterfaceVersion.h.in