Add API for returning system formatted error string
Merge remote-tracking branch 'refs/remotes/origin/master'
Merge remote-tracking branch 'upstream/master'
Don't get stuck in an infinite loop of allocating memory
Added ability to change the opacity of text outlines independently of
the text itself
Don't test against the same element when renaming it; Fix auto-fill of
scene and global source rename dialog; Fixes issue #118
Remove redundant XBaseItem methods
Merge remote-tracking branch 'upstream/master'

Conflicts:
	OBS.rc
	Source/TextOutputSource.cpp
	Source/WindowStuff.cpp
Remove duplicate switch case from previous merge
Merge remote-tracking branch 'upstream/master'
Use environment variables for include directories; Don't rely on MFC
being present
Make solution work in both VSE2010 and VSE2012
Added a second push to talk hotkey
Merge pull request #129 from paibox/master

Added a second push to talk key to the audio settings
fix to the multi PTT hotkey code
Made graphics capture hook to use more common API functions when getting a temp swap chain
Merge remote-tracking branch 'upstream/master'
Merge branch 'envproj'
new network code
fixed delay, added timed bframe-only dropping