Orochimarufan ca1fd44637 Merge branch 'master' of http://github.com/peterix/MultiMC5 ... Conflicts: CMakeLists.txt gui/mainwindow.cpp main.cpp		2013-02-21 20:40:32 +01:00
..
icons	Reorganized the main CMakeLists file and added an icon on Windows.	2013-02-21 10:32:13 -06:00
XdgIcon.theme	Implement About Dialog	2013-02-21 19:35:52 +01:00