Archive/openmw
0
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-05-04 15:57:59 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 36

Merge branch 'master' into cc9cii

Browse source 
Conflicts:
	apps/opencs/view/doc/view.hpp
This commit is contained in:
cc9cii 2015-06-19 07:49:18 +10:00
commit 3b27e643b8
122 changed files with 1581 additions and 500 deletions
Download patch file Download diff file Expand all files Collapse all files

2
apps/opencs/editor.hpp
View file

@ -64,7 +64,7 @@ namespace CS
void setupDataFiles (const Files::PathContainer& dataDirs);
std::pair<Files::PathContainer, std::vector<std::string> > readConfig();
std::pair<Files::PathContainer, std::vector<std::string> > readConfig(bool quiet=false);
///< \return data paths
// not implemented