diff options
| author | Petr Mrázek <peterix@gmail.com> | 2013-02-21 18:09:26 +0100 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2013-02-21 18:09:26 +0100 |
| commit | 58379657e99a146123814fd182d6c58424e9713e (patch) | |
| tree | 98b601a9edf238683857ab9ad78855cbf52a64e9 /gui/taskdialog.h | |
| parent | 1beef3f73cd126af9ce3805b6990c64b835a593b (diff) | |
| parent | 96e4f73a94e0697ce7200e09983d447220ea5a0b (diff) | |
| download | PrismLauncher-58379657e99a146123814fd182d6c58424e9713e.tar.gz PrismLauncher-58379657e99a146123814fd182d6c58424e9713e.tar.bz2 PrismLauncher-58379657e99a146123814fd182d6c58424e9713e.zip | |
Merge branch 'inst_rewrite' of https://github.com/Forkk/MultiMC5
Conflicts:
data/instancemodel.cpp
Diffstat (limited to 'gui/taskdialog.h')
0 files changed, 0 insertions, 0 deletions