stojce 547f33f4d6 Merge branch 'master' of https://github.com/worklist/hifi into 19508 ... Conflicts: interface/interface_en.ts		2014-03-25 22:15:52 +01:00
..
external	slightly different approach to windows warning fix	2014-03-15 21:30:45 -07:00
resources	Merge branch 'master' of https://github.com/worklist/hifi into 19508	2014-03-25 22:15:52 +01:00
src	Merge branch 'master' of https://github.com/worklist/hifi into 19508	2014-03-25 22:15:52 +01:00
ui	layout improvements	2014-03-23 16:20:29 +01:00
CMakeLists.txt	more cleanup	2014-03-22 20:42:34 -07:00
interface.icns
interface_en.ts	Adjust avatar LOD more aggressively: raise detail slowly when above our target	2014-03-24 16:45:44 -07:00
InterfaceConfig.h.in
InterfaceVersion.h.in