diff options
| author | Andrew <forkk@forkk.net> | 2013-10-01 03:31:20 -0500 |
|---|---|---|
| committer | Andrew <forkk@forkk.net> | 2013-10-01 03:31:20 -0500 |
| commit | 22bdf67bf74b35f6ee4f68d66a9f0ee9f970c043 (patch) | |
| tree | 126e738cefee995645b016187009ca38ab90157a /gui/logindialog.cpp | |
| parent | 751c532175780a8a2c3a6e069f93ad51599e988f (diff) | |
| parent | db3c26f53e12bc396d3d35d9ee2fe62e9ca112ad (diff) | |
| download | MultiMC-22bdf67bf74b35f6ee4f68d66a9f0ee9f970c043.tar MultiMC-22bdf67bf74b35f6ee4f68d66a9f0ee9f970c043.tar.gz MultiMC-22bdf67bf74b35f6ee4f68d66a9f0ee9f970c043.tar.lz MultiMC-22bdf67bf74b35f6ee4f68d66a9f0ee9f970c043.tar.xz MultiMC-22bdf67bf74b35f6ee4f68d66a9f0ee9f970c043.zip | |
Merge branch 'master' into develop
This pulls in some changes I made to the CMakeLists file earlier.
Diffstat (limited to 'gui/logindialog.cpp')
0 files changed, 0 insertions, 0 deletions