Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-04-09 12:03:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
overte-HifiExperiments/cmake
History
Andrzej Kapolka 865b495e6c Merge branch 'master' of https://github.com/worklist/hifi into debone 
Conflicts:
	interface/src/Audio.cpp
	interface/src/Menu.cpp
	interface/src/avatar/Avatar.h
	interface/src/avatar/MyAvatar.cpp
	interface/src/devices/Webcam.cpp
	interface/src/devices/Webcam.h
	interface/src/renderer/FBXReader.cpp
2014-01-16 13:35:03 -08:00
..
macros try to get this to work 2014-01-10 22:58:32 -08:00
modules Merge branch 'master' of https://github.com/worklist/hifi into debone 2014-01-16 13:35:03 -08:00