overte/interface
Andrzej Kapolka b5a8c2710c Merge branch 'master' of https://github.com/worklist/hifi into pointy
Conflicts:
	interface/src/Application.h
	interface/src/Audio.h
	interface/src/Webcam.cpp
2013-07-18 18:09:57 -07:00
..
external Added libvpx library for OS X. 2013-07-18 17:56:15 -07:00
resources More work on face points. 2013-07-15 16:09:49 -07:00
src Merge branch 'master' of https://github.com/worklist/hifi into pointy 2013-07-18 18:09:57 -07:00
CMakeLists.txt Working on integrating LibVPX for VP8 (9?) encoding. 2013-07-17 11:33:36 -07:00
interface.icns update to newer interface icon 2013-05-15 14:43:35 -07:00
InterfaceConfig.h.in add header for glut to conditional include in InterfaceConfig 2013-02-08 14:57:59 -08:00