piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-23 06:09:50 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into wii-network

Browse Source 
Conflicts:
	Source/Core/Core/CMakeLists.txt
This commit is contained in:
Matthew Parlane
2013-04-11 19:55:36 +12:00
parent 7784fa4c67 3c87512180
commit 0c9d8d34e1
369 changed files with 21804 additions and 18869 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Source/Core/Common/Src/FileUtil.h
View File

@ -133,7 +133,10 @@ bool SetCurrentDir(const std::string &directory);
// Returns a pointer to a string with a Dolphin data dir in the user's home
// directory. To be used in "multi-user" mode (that is, installed).
std::string &GetUserPath(const unsigned int DirIDX, const std::string &newPath="");
const std::string& GetUserPath(const unsigned int DirIDX, const std::string &newPath="");
// probably doesn't belong here
std::string GetThemeDir(const std::string& theme_name);
// Returns the path to where the sys file are
std::string GetSysDirectory();