mirror/Aquaria
1
0
Fork 0
mirror of https://github.com/AquariaOSE/Aquaria.git synced 2024-11-25 17:53:47 +00:00
Code Issues Releases Wiki Activity

Merge branch 'master' into experimental

Browse source
This commit is contained in:
fgenesis 2016-02-15 17:17:59 +01:00
commit 77c7aed8a0
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Aquaria/Main.cpp
View file

@ -99,8 +99,7 @@ static void CheckConfig(void)
dsqParam = AQUARIA_DEFAULT_DATA_DIR; dsqParam = AQUARIA_DEFAULT_DATA_DIR;
#endif #endif
#ifdef AQUARIA_EXTRA_DATA_DIR #ifdef AQUARIA_EXTRA_DATA_DIR
if(!envPath) extraDataDir = AQUARIA_EXTRA_DATA_DIR;
extraDataDir = AQUARIA_EXTRA_DATA_DIR;
#endif #endif
#endif #endif