Elisa Lupin-Jimenez 1102b27ba1 Fixed merge conflicts with master		2017-08-08 11:47:08 -07:00
..
animation
audio
audio-client
auto-updater
avatars
avatars-renderer
controllers	Merge branch 'master' into feature/secondary-pose-support	2017-08-04 16:11:13 -07:00
display-plugins
embedded-webserver
entities
entities-renderer
fbx
gl
gpu
gpu-gl	avoid calling a pure virtual function from GLBackend dtor	2017-08-06 12:47:45 -07:00
image
input-plugins
ktx
midi
model
model-networking
networking	missed some statics	2017-08-06 13:12:27 -07:00
octree
physics
plugins
procedural
recording
render
render-utils
script-engine	Fixed merge conflicts with master	2017-08-08 11:47:08 -07:00
shared	Merge pull request #11053 from hyperlogic/feature/secondary-pose-support	2017-08-07 13:11:48 -07:00
trackers
ui	adjust various things that cause a crash-on-exit on Linux	2017-08-06 11:57:55 -07:00
ui-plugins