Seth Alves 6e5aca6da4 merge from upstream		2015-07-27 16:52:36 -07:00
..
animation	merge from upstream	2015-07-27 16:52:36 -07:00
audio	resolve conflicts on merge with upstream/master	2015-07-20 12:29:38 -07:00
audio-client	kill the PacketLister (AKA Huffman 1 : PacketListener 0)	2015-07-17 09:07:39 -07:00
auto-updater	Don't display update dialog if this is a PR build	2015-07-02 14:17:36 -06:00
avatars	Cleanup false starts.	2015-07-27 13:42:18 -07:00
embedded-webserver
entities	merge from upstream	2015-07-27 16:52:36 -07:00
entities-renderer	Merge branch 'master' of https://github.com/highfidelity/hifi into rig	2015-07-27 13:45:25 -07:00
environment	put back correct include for memcpy	2015-07-17 16:38:20 -07:00
fbx	Merge branch 'master' of https://github.com/highfidelity/hifi into rig	2015-07-27 09:20:30 -07:00
gpu	Cleaning up the FBO cache and the output stage in general	2015-07-24 14:47:44 -07:00
model	REmove the crappy solution for drawing transparent texture into overlay by a proper shader	2015-07-23 23:09:40 -07:00
networking	only output no listener for type message one time	2015-07-24 09:36:27 -07:00
octree	add back a removed comment from jurisdiction map	2015-07-17 14:00:02 -07:00
physics	fix crash for convex hull of co-planar points	2015-07-22 15:06:10 -07:00
render	Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers	2015-07-20 13:51:51 -07:00
render-utils	merge from upstream	2015-07-27 16:52:36 -07:00
script-engine	Avoid creating a new variable in js print	2015-07-23 15:32:40 -07:00
shared	Preparing for first pr	2015-07-22 10:43:50 -07:00
ui	Merge remote-tracking branch 'upstream/master' into marge	2015-07-21 08:59:29 -07:00