overte-JulianGro/interface
Stojce Slavkovski 5a27ded669 Merge branch 'master' of https://github.com/worklist/hifi into 19461
Conflicts:
	interface/src/Application.cpp
2013-12-16 22:57:47 +01:00
..
external remove PortAudio entirely 2013-12-03 12:38:26 -08:00
resources added dialog for log data 2013-12-16 22:43:17 +01:00
src Merge branch 'master' of https://github.com/worklist/hifi into 19461 2013-12-16 22:57:47 +01:00
CMakeLists.txt Tidy up 2013-12-16 11:05:08 -06:00
interface.icns
InterfaceConfig.h.in Adding build sequence to Interface build 2013-12-16 11:03:49 -06:00
InterfaceVersion.h.in Tidy up 2013-12-16 11:05:08 -06:00