Jeffrey Ventrella f8392c0843 Merge remote-tracking branch 'upstream/master' into particles		2013-07-29 15:07:56 -07:00
..
external	Added libvpx library for OS X.	2013-07-18 17:56:15 -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 remote-tracking branch 'upstream/master' into particles	2013-07-29 15:07:56 -07:00
CMakeLists.txt	Merge branch 'master' of https://github.com/worklist/hifi into voxel_stats	2013-07-20 11:35:10 -07:00
interface.icns
InterfaceConfig.h.in