overte-HifiExperiments/interface
Andrew Meadows af3fae7bbf Merge upsteam master into current project (experimental hand paddles)
Conflicts:
	interface/src/avatar/Avatar.cpp
	libraries/avatars/src/AvatarData.cpp
2014-01-14 16:39:46 -08:00
..
external remove the Leap integration 2014-01-06 11:09:59 -08:00
resources sytle changes on log dialog 2013-12-29 23:45:24 +01:00
src Merge upsteam master into current project (experimental hand paddles) 2014-01-14 16:39:46 -08:00
CMakeLists.txt Trivial change - testing deploy changes 2014-01-13 11:46:27 -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