Andrzej Kapolka cf78e21ea4 Merge branch 'master' of https://github.com/worklist/hifi into ossome ... Conflicts: interface/src/Application.cpp		2013-10-23 10:06:56 -07:00
..
haarcascades	Basic Haar cascade/CamShift tracking.	2013-06-19 18:02:26 -07:00
html	popup layot	2013-09-09 23:27:03 +02:00
images	close button on rear mirror view	2013-10-22 20:42:31 +02:00
info	change application name to Interface	2013-08-20 10:02:06 -07:00
shaders	Allow more bones. The model I'm testing with has about 60.	2013-10-18 19:18:48 -07:00