Merge remote-tracking branch 'origin/updating' into config_snapshots

This commit is contained in:
bubnikv 2018-04-10 16:46:15 +02:00
commit 4275b15dcd
40 changed files with 3378 additions and 85 deletions

View file

@ -119,7 +119,7 @@ static std::string g_data_dir;
void set_data_dir(const std::string &dir)
{
g_data_dir = dir;
g_data_dir = dir + "-alpha"; // FIXME: Resolve backcompat problems
}
const std::string& data_dir()