Ryan Huffman a13810bd72 Merge branch 'master' of git://github.com/highfidelity/hifi into 19779 ... Conflicts: interface/src/location/LocationManager.cpp		2014-06-16 11:35:55 -07:00
..
external	Better instructions.	2014-05-12 17:55:07 -07:00
resources	Merge branch 'master' of https://github.com/highfidelity/hifi into cascade	2014-05-29 17:09:09 -07:00
src	Merge branch 'master' of git://github.com/highfidelity/hifi into 19779	2014-06-16 11:35:55 -07:00
ui	Merge branch master of upstream	2014-05-29 22:31:32 +05:30
CMakeLists.txt	put back ssize_t definition	2014-05-20 11:56:06 -07:00
interface.icns
interface_en.ts
InterfaceConfig.h.in
InterfaceVersion.h.in