103 Commits

Author	SHA1	Message	Date
jp9000	b6b183cd21	Fixed the mixing problem with mics when the desktop is muted	2013-01-24 20:42:24 -07:00
jp9000	f07a55caad	Moving stuff around, this might be extremely painful	2013-01-24 20:31:34 -07:00
jp9000	e2ea43ca93	merging develepment branch. don't kill me!	2013-01-24 20:30:22 -07:00