summaryrefslogtreecommitdiffstats
path: root/gui/logindialog.cpp
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2013-09-08 16:21:49 +0200
committerPetr Mrázek <peterix@gmail.com>2013-09-08 16:21:49 +0200
commit499ee1e36569fca73bdb809183242b03da69f3ef (patch)
tree8d29f00958da54ade7e560b98e43fae89dfff0d4 /gui/logindialog.cpp
parent7e1cf22ce61e8a5450e5dc74993e471c20b2742f (diff)
parentdab2bbe4e79cfd8b3b72b8d2fd0e5bd66e0281a9 (diff)
downloadMultiMC-499ee1e36569fca73bdb809183242b03da69f3ef.tar
MultiMC-499ee1e36569fca73bdb809183242b03da69f3ef.tar.gz
MultiMC-499ee1e36569fca73bdb809183242b03da69f3ef.tar.lz
MultiMC-499ee1e36569fca73bdb809183242b03da69f3ef.tar.xz
MultiMC-499ee1e36569fca73bdb809183242b03da69f3ef.zip
Merge branch 'master' of https://github.com/Stiepen22/MultiMC5 into develop
Conflicts: AppSettings.cpp MultiMC.pro main.cpp
Diffstat (limited to 'gui/logindialog.cpp')
0 files changed, 0 insertions, 0 deletions