diff options
| author | Tannin <sherb@gmx.net> | 2015-11-17 19:10:15 +0100 |
|---|---|---|
| committer | Tannin <sherb@gmx.net> | 2015-11-17 19:12:53 +0100 |
| commit | 0bd38e3f67c39fb37f75f639b81b02c100ad3375 (patch) | |
| tree | 7360e10227abdebe280624266a0f7b295ca37ff8 /src/installationmanager.cpp | |
| parent | 7f4f4cafea5a196ddf824adf7c4e65cec5d44d88 (diff) | |
| parent | 56ba058cd54d073280eb86978d178e45253e6e19 (diff) | |
Merge branch 'master' into new_vfs_library
Conflicts:
src/CMakeLists.txt
Diffstat (limited to 'src/installationmanager.cpp')
0 files changed, 0 insertions, 0 deletions