Atlante45 a1bd558d71 Safe locks		2015-08-03 14:39:51 -07:00
..
animation	Merge pull request #5323 from MarcelEdward/20605	2015-07-30 07:30:01 -07:00
audio	shuffle Packet headers, use static enum for PacketType	2015-07-23 13:56:47 -07:00
audio-client	kill the PacketLister (AKA Huffman 1 : PacketListener 0)	2015-07-17 09:07:39 -07:00
auto-updater
avatars	resolve conflicts on merge with upstream/master	2015-07-24 15:40:35 -07:00
embedded-webserver
entities	resolve conflicts on merge with upstream/master	2015-07-31 17:27:23 -07:00
entities-renderer	resolve conflicts on merge with upstream/master	2015-07-31 17:27:23 -07:00
environment	put back correct include for memcpy	2015-07-17 16:38:20 -07:00
fbx	Merge pull request #5323 from MarcelEdward/20605	2015-07-30 07:30:01 -07:00
gpu	resolve conflicts on merge with upstream/master	2015-07-31 17:27:23 -07:00
model	compile on linux with GLEW	2015-07-28 17:53:01 -07:00
networking	Safe locks	2015-08-03 14:39:51 -07:00
octree	Remove unnecessary headers	2015-07-28 10:36:00 -07:00
physics	fix crash for convex hull of co-planar points	2015-07-22 15:06:10 -07:00
render	REmove more of the unnecessary GLBacken .h and GPUCOnfig.h include, The gpu::Context is now completely agnostic of the True Backend	2015-07-30 15:07:36 -07:00
render-utils	FIxed the problem on Mac, by removing all of the gpuConfig includesgit status	2015-07-30 18:27:47 -07:00
script-engine	fixed merge conflicts and refactored hit effect to catch up with refactored rendering engine	2015-07-29 10:02:06 -07:00
shared	complete the initial version of UDTTest	2015-07-30 17:09:25 -07:00
ui	Merge remote-tracking branch 'upstream/master' into marge	2015-07-21 08:59:29 -07:00