Stephen Birarda 5bed3502ef fix order of ctors and assignment operators		2015-07-22 14:15:17 -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	Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers	2015-07-20 14:50:44 -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	Merge remote-tracking branch 'upstream/master' into marge	2015-07-21 08:59:29 -07:00
model	Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers	2015-07-20 14:50:44 -07:00
networking	fix order of ctors and assignment operators	2015-07-22 14:15:17 -07:00
octree	add back a removed comment from jurisdiction map	2015-07-17 14:00:02 -07:00
physics	cleanup some warnings	2015-07-15 11:20:55 -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	Fixing FBO bug on resizing windows	2015-07-22 11:28:36 -04:00
script-engine	fixes in edit.js UI	2015-07-21 13:15:24 -07:00
shared	Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers	2015-07-20 14:50:44 -07:00
ui	Merge remote-tracking branch 'upstream/master' into marge	2015-07-21 08:59:29 -07:00