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
..
animation
audio
audio-client
auto-updater	Don't display update dialog if this is a PR build	2015-07-02 14:17:36 -06:00
avatars
display-plugins	Trying to get mac display plugins working:	2015-07-02 22:29:22 -07:00
embedded-webserver
entities	Merge pull request #5205 from SeijiEmery/unit-tests	2015-07-02 20:58:09 -04:00
entities-renderer	Merge pull request #5221 from Atlante45/web	2015-07-02 10:45:20 -07:00
environment
fbx
gpu	Merge remote-tracking branch 'upstream/master' into plugins	2015-07-03 06:17:35 -07:00
model
networking	Merge pull request #5232 from sethalves/actions-over-wire-and-sim-ownership	2015-07-02 14:57:27 -07:00
octree	Merge pull request #5232 from sethalves/actions-over-wire-and-sim-ownership	2015-07-02 14:57:27 -07:00
physics	responses to code review	2015-07-01 10:42:04 -07:00
plugins	Working on plugin menu items	2015-07-01 09:05:26 -07:00
render
render-utils	Merge remote-tracking branch 'upstream/master' into plugins	2015-07-03 06:17:35 -07:00
script-engine
shared	Merge pull request #5232 from sethalves/actions-over-wire-and-sim-ownership	2015-07-02 14:57:27 -07:00
ui	Merge pull request #5219 from venkatn93/master	2015-06-29 10:51:16 -07:00