overte-HifiExperiments/interface
atlante45 34cbe317fa Merge branch 'master' of https://github.com/worklist/hifi into the_midget_are_coming
Conflicts:
	interface/src/Avatar.cpp
	interface/src/Webcam.cpp
2013-07-12 17:57:20 -07:00
..
external Merge pull request #634 from machinelevel/dev4 2013-07-10 18:05:03 -07:00
resources Added UI responsivness 2013-07-02 16:17:25 +02:00
src Merge branch 'master' of https://github.com/worklist/hifi into the_midget_are_coming 2013-07-12 17:57:20 -07:00
CMakeLists.txt Revert "link STK to interface" 2013-07-12 13:12:52 -07:00
interface.icns update to newer interface icon 2013-05-15 14:43:35 -07:00
InterfaceConfig.h.in