Andrzej Kapolka 3ad0b8b99d Merge branch 'master' of https://github.com/worklist/hifi into ssao ... Conflicts: interface/src/Application.h		2013-08-15 10:06:22 -07:00
..
haarcascades	Basic Haar cascade/CamShift tracking.	2013-06-19 18:02:26 -07:00
images	merge	2013-08-01 15:48:57 -07:00
info	add fervor updater and run during launch if OS X release	2013-06-26 10:36:32 -07:00
shaders	Merge branch 'master' of https://github.com/worklist/hifi into ssao	2013-08-15 10:06:22 -07:00