Stephen Birarda c80c4a9b45 resolve conflicts on merge with origin/protocol		2015-08-27 14:45:22 -07:00
..
animation	Merge branch 'protocol' of github.com:birarda/hifi into atp-server	2015-08-26 12:26:11 -07:00
audio	Merge branch 'protocol' of github.com:birarda/hifi into atp-server	2015-08-26 12:26:11 -07:00
audio-client	Removing tabs from our javascript and C++	2015-08-24 15:26:46 -07:00
auto-updater
avatars	Merge branch 'master' of https://github.com/highfidelity/hifi into update_protocol	2015-08-26 16:50:33 +02:00
display-plugins	Fixing aspect ratio on stereo plugins	2015-08-25 19:05:31 -07:00
embedded-webserver	remove the explicit failure test	2015-08-21 14:55:24 -07:00
entities	Merge branch 'master' of https://github.com/highfidelity/hifi into update_protocol	2015-08-26 16:50:33 +02:00
entities-renderer	Merge branch 'master' of https://github.com/highfidelity/hifi into update_protocol	2015-08-26 16:50:33 +02:00
environment
fbx	Removed some debugging statements	2015-08-21 16:55:08 -07:00
gpu	Merge pull request #5529 from SeijiEmery/gputest	2015-08-25 20:03:08 -07:00
input-plugins	Fix UserInputMapper event generation	2015-08-25 19:15:06 -07:00
model	Removing tabs from our javascript and C++	2015-08-24 15:26:46 -07:00
networking	resolve conflicts on merge with origin/protocol	2015-08-27 14:45:22 -07:00
octree	Merge branch 'master' of https://github.com/highfidelity/hifi into update_protocol	2015-08-26 16:50:33 +02:00
physics
plugins	Stereo rendering work	2015-08-22 16:15:10 -07:00
render
render-utils	Remove unused variable	2015-08-27 14:11:40 -07:00
script-engine	Remove assert in ScriptCache	2015-08-27 12:58:57 -07:00
shared	Merge branch 'master' of https://github.com/highfidelity/hifi into update_protocol	2015-08-26 16:50:33 +02:00
ui