Merge with develop

This commit is contained in:
emb 2015-07-27 12:55:39 -05:00
commit 2b45de3a2b

View File

@ -40,9 +40,6 @@ Configuration::~Configuration()
void Configuration::initialize()
{
absolutePath = "D:/RetroFE";
return;
const char *environment = std::getenv("RETROFE_PATH");
std::string environmentStr;
if (environment != NULL)