Stephen Birarda f07314f4ef resolve conflicts on merge with huffman/baseball		2015-11-30 13:34:36 -08:00
..
animation	Fixes hand IK for some avatars	2015-11-24 18:57:35 -08:00
audio	resolve conflicts on merge with upstream/master	2015-11-30 13:32:38 -08:00
audio-client
auto-updater
avatars	Fixing avatar facial blendshapes and attachments in recordings	2015-11-23 22:36:07 -08:00
controllers
display-plugins
embedded-webserver
entities	resolve conflicts on merge with upstream/master	2015-11-30 13:32:38 -08:00
entities-renderer	resolve conflicts on merge with upstream/master	2015-11-30 13:32:38 -08:00
environment
fbx
gl
gpu
input-plugins
model
model-networking
networking	resolve conflicts on merge with huffman/baseball	2015-11-30 13:34:36 -08:00
octree
physics	resolve conflicts on merge with huffman/baseball	2015-11-30 13:34:36 -08:00
plugins
procedural
recording
render
render-utils
script-engine	resolve conflicts on merge with upstream/master	2015-11-30 13:32:38 -08:00
shared	resolve conflicts on merge with upstream/master	2015-11-30 13:32:38 -08:00
ui	Fix crash when try to remove invalid menu item in JavaScript	2015-11-30 08:33:38 +13:00