diff options
| author | Marius Kintel <marius@kintel.net> | 2012-07-05 13:41:15 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2012-07-05 13:41:15 (GMT) |
| commit | 694382bba9d1645547afc3ece9920e48f8767295 (patch) | |
| tree | 9fb4c3e7f198a764472b7fa95a2e2600320ff04b /src/parsersettings.h | |
| parent | 197a4e4d364fbdd0aca8fb9027476ee1c48652e3 (diff) | |
| parent | 329295f17fe1b3d2d6b218c762201214f431b70a (diff) | |
Merge branch 'master' into value
Conflicts:
src/parsersettings.cc
Diffstat (limited to 'src/parsersettings.h')
| -rw-r--r-- | src/parsersettings.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/parsersettings.h b/src/parsersettings.h index a5dc939..007aa9c 100644 --- a/src/parsersettings.h +++ b/src/parsersettings.h @@ -6,7 +6,7 @@ extern int parser_error_pos; void parser_init(const std::string &applicationpath); -void set_librarydir(const std::string &libdir); -const std::string &get_librarydir(); +void add_librarydir(const std::string &libdir); +std::string locate_file(const std::string &filename); #endif |