Niraj Venkat 5dd16d9f80 Blend function applied to reduce one FBO		2015-07-24 16:07:30 -07:00
..
animation	CR	2015-07-14 15:16:00 -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
avatars	add a comment for size guard	2015-07-23 17:17:59 -07:00
embedded-webserver
entities	Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers	2015-07-20 14:50:44 -07:00
entities-renderer	Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers	2015-07-20 14:50:44 -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 smart_pointers	2015-07-17 17:59:19 -07:00
gpu	Fixing merge conflicts	2015-07-24 11:08:40 -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 avatar	2015-07-22 10:27:39 -07:00
render-utils	Blend function applied to reduce one FBO	2015-07-24 16:07:30 -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