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 /tests/csgtexttest.cc | |
| parent | 197a4e4d364fbdd0aca8fb9027476ee1c48652e3 (diff) | |
| parent | 329295f17fe1b3d2d6b218c762201214f431b70a (diff) | |
Merge branch 'master' into value
Conflicts:
src/parsersettings.cc
Diffstat (limited to 'tests/csgtexttest.cc')
| -rw-r--r-- | tests/csgtexttest.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/csgtexttest.cc b/tests/csgtexttest.cc index 6e18f20..e050232 100644 --- a/tests/csgtexttest.cc +++ b/tests/csgtexttest.cc @@ -81,7 +81,7 @@ int main(int argc, char **argv) currentdir = boosty::stringy( fs::current_path() ); parser_init(QCoreApplication::instance()->applicationDirPath().toStdString()); - set_librarydir(boosty::stringy(fs::path(QCoreApplication::instance()->applicationDirPath().toStdString()) / "../libraries")); + add_librarydir(boosty::stringy(fs::path(QCoreApplication::instance()->applicationDirPath().toStdString()) / "../libraries")); Context root_ctx; register_builtin(root_ctx); |