Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-25 11:34:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
overte-HifiExperiments/interface
History
Andrew Meadows 72deb2e49b merge upstream/master into andrew/thermonuclear 
Conflicts:
	libraries/entities/src/EntityItem.h
	libraries/physics/src/EntityMotionState.cpp
2015-04-27 12:54:21 -07:00
..
external remove visage related files 2015-04-17 13:40:31 -07:00
icon fix check for debug/release icon 2015-01-30 15:41:44 -08:00
resources Cleaning up unused stuff 2015-04-24 16:44:48 -07:00
src merge upstream/master into andrew/thermonuclear 2015-04-27 12:54:21 -07:00
ui Merge branch 'master' of https://github.com/highfidelity/hifi into avatarUI 2015-04-14 13:13:15 -07:00
CMakeLists.txt Breaking up offscreen UI work 2015-04-24 13:21:21 -07:00
interface_en.ts remove more references to voxels 2015-01-07 16:09:56 -08:00
InterfaceConfig.h.in missed copyright cleanups in apache header 2014-04-09 09:44:38 -07:00
InterfaceVersion.h.in missed copyright cleanups in apache header 2014-04-09 09:44:38 -07:00