Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-04 17:43:09 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
overte-HifiExperiments/interface
History
ZappoMan ed0a2a5a18 Merge branch 'master' of https://github.com/worklist/hifi into scripting_work 
Conflicts:
	libraries/shared/src/SharedUtil.cpp
	libraries/shared/src/SharedUtil.h
	libraries/voxels/src/VoxelEditPacketSender.cpp
2014-01-29 19:49:36 -08:00
..
external fixing bad merge 2014-01-17 20:01:49 +01:00
resources Don't add the specular alpha in the model fragment shaders. 2014-01-27 17:44:13 -08:00
src Merge branch 'master' of https://github.com/worklist/hifi into scripting_work 2014-01-29 19:49:36 -08:00
ui repair the UpdateDialog so it is a QDialog with no child QWidget 2014-01-22 14:17:56 -08:00
CMakeLists.txt remove QUiTools include, not needed 2014-01-22 14:20:40 -08:00
interface.icns
InterfaceConfig.h.in
InterfaceVersion.h.in