Conflicts:
	companion/src/modeledit/customfunctions.cpp
	companion/src/modeledit/customfunctions.h
This commit is contained in:
bsongis
2014-12-08 23:14:00 +01:00
parent 65ff9dcefa
commit f608985a54
4 changed files with 76 additions and 32 deletions
+3
View File
@@ -154,4 +154,7 @@ int qunlink(const QString & fileName);
QString generateProcessUniqueTempFileName(const QString & fileName);
QString getSoundsPath(const GeneralSettings &generalSettings);
QSet<QString> getFilesSet(const QString &path, const QStringList &filter, int maxLen);
#endif // HELPERS_H