overte-AleziaKurdis/interface
Seiji Emery 29dcdefd26 Merge branch 'master' of https://github.com/highfidelity/hifi into gputest
Conflicts:
	cmake/modules/Find3DConnexionClient.cmake
	interface/external/connexionclient/readme.txt
	interface/src/devices/3DConnexionClient.cpp
	interface/src/devices/3DConnexionClient.h
2015-08-05 12:45:00 -07:00
..
external Merge branch 'master' of https://github.com/highfidelity/hifi into gputest 2015-08-05 12:45:00 -07:00
icon
resources Use single file robot model as fallback for full avatar models 2015-07-29 19:34:05 -07:00
src Merge branch 'master' of https://github.com/highfidelity/hifi into gputest 2015-08-05 12:45:00 -07:00
ui Rename and refactor eye deflection slider 2015-07-16 14:05:34 -07:00
CMakeLists.txt Merge branch 'master' into core 2015-08-03 22:18:38 -07:00
interface_en.ts
InterfaceVersion.h.in