summaryrefslogtreecommitdiffstats
path: root/multimc.qrc
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2013-02-21 18:09:26 +0100
committerPetr Mrázek <peterix@gmail.com>2013-02-21 18:09:26 +0100
commit58379657e99a146123814fd182d6c58424e9713e (patch)
tree98b601a9edf238683857ab9ad78855cbf52a64e9 /multimc.qrc
parent1beef3f73cd126af9ce3805b6990c64b835a593b (diff)
parent96e4f73a94e0697ce7200e09983d447220ea5a0b (diff)
downloadMultiMC-58379657e99a146123814fd182d6c58424e9713e.tar
MultiMC-58379657e99a146123814fd182d6c58424e9713e.tar.gz
MultiMC-58379657e99a146123814fd182d6c58424e9713e.tar.lz
MultiMC-58379657e99a146123814fd182d6c58424e9713e.tar.xz
MultiMC-58379657e99a146123814fd182d6c58424e9713e.zip
Merge branch 'inst_rewrite' of https://github.com/Forkk/MultiMC5
Conflicts: data/instancemodel.cpp
Diffstat (limited to 'multimc.qrc')
0 files changed, 0 insertions, 0 deletions