Andrzej Kapolka d3b7a31e3b Merge branch 'master' of https://github.com/worklist/hifi ... Conflicts: interface/src/Camera.cpp		2013-08-07 14:27:17 -07:00
..
external	- changed according to review comments	2013-08-05 15:23:40 -07:00
resources	Switching between textured and untextured modes.	2013-08-06 16:23:58 -07:00
src	Merge branch 'master' of https://github.com/worklist/hifi	2013-08-07 14:27:17 -07:00
CMakeLists.txt	changes for stub pull request of assignee work	2013-08-05 10:06:50 -07:00
interface.icns
InterfaceConfig.h.in