overte-JulianGro/interface
Brad Davis 2a1776303d Merge remote-tracking branch 'upstream/master' into plugins
Conflicts:
	interface/src/Application.cpp
	interface/src/avatar/SkeletonModel.cpp
	interface/src/devices/OculusManager.cpp
	interface/src/devices/TV3DManager.cpp
2015-07-03 06:17:35 -07:00
..
external remove visage related files 2015-04-17 13:40:31 -07:00
icon
resources Merge remote-tracking branch 'upstream/master' into plugins 2015-07-03 06:17:35 -07:00
src Merge remote-tracking branch 'upstream/master' into plugins 2015-07-03 06:17:35 -07:00
ui Avatar collision sounds. 2015-06-26 16:23:16 -07:00
CMakeLists.txt Merge remote-tracking branch 'upstream/master' into plugins 2015-07-03 06:17:35 -07:00
interface_en.ts
InterfaceConfig.h.in Working on mac compilability 2015-07-01 23:03:33 -07:00
InterfaceVersion.h.in