Seth Alves 3e88e1f400 unbungle merge		2015-06-29 10:04:27 -07:00
..
animation
audio	Allow scripted audio injectors to have options set.	2015-06-23 21:01:34 -07:00
audio-client	Merge pull request #5161 from PhilipRosedale/master	2015-06-22 12:09:08 -07:00
auto-updater	typo	2015-06-16 14:49:55 -06:00
avatars	Make renderDisplayName const	2015-06-18 15:22:49 +02:00
embedded-webserver
entities	unbungle merge	2015-06-29 10:04:27 -07:00
entities-renderer	Merge pull request #5213 from birarda/hyperlink-photo	2015-06-26 17:05:33 -07:00
environment
fbx	fix syntax	2015-06-19 17:13:29 +02:00
gpu	Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire	2015-06-22 15:37:10 -07:00
model	merge from upstream	2015-06-18 15:03:09 -07:00
networking	merge andrew's sim-ownership branch	2015-06-29 09:50:38 -07:00
octree	remove cruft canAppendBytes() method	2015-06-26 23:12:48 -07:00
physics	merge andrew's sim-ownership branch	2015-06-29 09:50:38 -07:00
render	Fix the cookie cutter problem in stereo, the alphaThreshold wasn 't assigned correctly for opaque	2015-06-19 16:30:48 +02:00
render-utils	Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire	2015-06-26 20:06:10 -07:00
script-engine	Merge branch 'master' into 20547	2015-06-26 13:05:51 -07:00
shared	merge andrew's sim-ownership branch	2015-06-29 09:50:38 -07:00
ui	add note for UI link	2015-06-26 14:17:54 -07:00