Kevin M. Thomas 5f7fe30b9b Merge branch 'master' of https://github.com/highfidelity/hifi into 20618 ... # Conflicts: # interface/src/Menu.cpp		2015-07-24 15:10:34 -04:00
..
external
icon
resources	Working on line height	2015-07-17 14:33:32 -07:00
src	Merge branch 'master' of https://github.com/highfidelity/hifi into 20618	2015-07-24 15:10:34 -04:00
ui	Rename and refactor eye deflection slider	2015-07-16 14:05:34 -07:00
CMakeLists.txt	resolve conflicts on merge with upstream/master	2015-07-20 12:29:38 -07:00
interface_en.ts
InterfaceVersion.h.in