summaryrefslogtreecommitdiffstats
path: root/gui/aboutdialog.cpp
diff options
context:
space:
mode:
authorOrochimarufan <orochimarufan.x3@gmail.com>2013-02-21 20:40:32 +0100
committerOrochimarufan <orochimarufan.x3@gmail.com>2013-02-21 20:40:32 +0100
commitca1fd44637ad5ce9ec287ff71addd38e98f66f4f (patch)
tree3642ff488dd144b014131de48bf926c6e3d1043c /gui/aboutdialog.cpp
parent576e979df4a54df9bf5ffeae3559f488b3045268 (diff)
parent50d1f62bf4a8d70466100463238228bc8305a5c7 (diff)
downloadMultiMC-ca1fd44637ad5ce9ec287ff71addd38e98f66f4f.tar
MultiMC-ca1fd44637ad5ce9ec287ff71addd38e98f66f4f.tar.gz
MultiMC-ca1fd44637ad5ce9ec287ff71addd38e98f66f4f.tar.lz
MultiMC-ca1fd44637ad5ce9ec287ff71addd38e98f66f4f.tar.xz
MultiMC-ca1fd44637ad5ce9ec287ff71addd38e98f66f4f.zip
Merge branch 'master' of http://github.com/peterix/MultiMC5
Conflicts: CMakeLists.txt gui/mainwindow.cpp main.cpp
Diffstat (limited to 'gui/aboutdialog.cpp')
0 files changed, 0 insertions, 0 deletions