![]() Merge branch 'master' into dev Conflicts: src/app/app.cpp |
||
---|---|---|
.. | ||
README.txt | ||
app.cpp | ||
app.h | ||
main.cpp | ||
system.cpp | ||
system.h | ||
system_linux.cpp | ||
system_linux.h | ||
system_other.cpp | ||
system_other.h | ||
system_windows.cpp | ||
system_windows.h |
README.txt
/** * \dir src/app * Main class of the application and system functions */