Stephen Birarda 8f900d22ca prefer typename to class for templates		2015-07-08 18:58:35 -07:00
..
animation
audio	fix writing to packet in AudioInjector	2015-07-08 16:39:24 -07:00
audio-client	fix for more primitive writes in AudioClient	2015-07-08 16:53:57 -07:00
auto-updater	Don't display update dialog if this is a PR build	2015-07-02 14:17:36 -06:00
avatars	missed API fixes in AudioClient and AvatarData	2015-07-08 16:53:04 -07:00
embedded-webserver
entities	resolve conflicts on merge with upstream/master	2015-07-08 18:41:48 -07:00
entities-renderer	resolve conflicts on merge with upstream/master	2015-07-08 18:41:48 -07:00
environment
fbx	fix syntax	2015-06-19 17:13:29 +02:00
gpu	Merge branch 'master' of https://github.com/highfidelity/hifi into fix_billboard	2015-07-06 18:05:43 -07:00
model	merge from upstream	2015-06-18 15:03:09 -07:00
networking	prefer typename to class for templates	2015-07-08 18:58:35 -07:00
octree	resolve conflicts on merge with upstream/master	2015-07-08 18:41:48 -07:00
physics	resolve conflicts on merge with upstream/master	2015-07-08 18:41:48 -07:00
render	Merge branch 'master' of https://github.com/highfidelity/hifi into yellow	2015-07-06 15:04:02 -07:00
render-utils	Merge branch 'master' of https://github.com/highfidelity/hifi into fix_billboard	2015-07-06 18:05:43 -07:00
script-engine	resolve conflicts on merge with upstream/master	2015-07-08 18:41:48 -07:00
shared	resolve conflicts on merge with upstream/master	2015-07-08 18:41:48 -07:00
ui	Merge pull request #5219 from venkatn93/master	2015-06-29 10:51:16 -07:00