Stephen Birarda 8549e9cb53 resolve conflicts on merge with upstream master		2014-12-15 09:36:17 -08:00
..
resources	Merge pull request #3810 from Atlante45/new_reverb_settings_description	2014-11-17 11:50:19 -08:00
src	resolve conflicts on merge with upstream master	2014-12-15 09:36:17 -08:00
CMakeLists.txt	add missing indentation for OpenSSL warnings	2014-10-15 13:31:44 -07:00