overte-HifiExperiments/interface
Andrzej Kapolka 2c9a8dfebc Merge branch 'master' of https://github.com/worklist/hifi into ssao
Conflicts:
	interface/src/Application.h
2013-08-19 10:42:12 -07:00
..
external update Q_OS_MAC ifdefs for Qt 5 2013-08-15 11:12:17 -07:00
resources Basic ambient occlusion effect up and running; needs tweaking and 2013-08-16 17:26:47 -07:00
src Merge branch 'master' of https://github.com/worklist/hifi into ssao 2013-08-19 10:42:12 -07:00
CMakeLists.txt add a DISABLE_OPENNI option for release builds without OpenNI 2013-08-16 14:28:22 -07:00
interface.icns update to newer interface icon 2013-05-15 14:43:35 -07:00
InterfaceConfig.h.in