ZappoMan 0a4fcdccb5 Merge branch 'master' of https://github.com/worklist/hifi into tile_import ... Conflicts: interface/src/Application.cpp		2013-08-01 15:44:28 -07:00
..
external	cmake source is root, make specific target	2013-07-31 12:21:49 -07:00
resources	Pass the aspect ratio into the shader, since it no longer necessarily	2013-07-18 21:25:11 -07:00
src	Merge branch 'master' of https://github.com/worklist/hifi into tile_import	2013-08-01 15:44:28 -07:00
CMakeLists.txt	test	2013-07-31 16:08:46 -07:00
interface.icns
InterfaceConfig.h.in