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

..

cmdutils.cpp

Merge branch 'master' of http://github.com/peterix/MultiMC5

2013-02-21 20:40:32 +01:00

inifile.cpp

Split MultiMC up into a few separate libraries.

2013-02-20 19:10:09 -06:00

osutils.cpp

Split MultiMC up into a few separate libraries.

2013-02-20 19:10:09 -06:00

pathutils.cpp

Split MultiMC up into a few separate libraries.

2013-02-20 19:10:09 -06:00

userutils.cpp

Merge branch 'master' of http://github.com/peterix/MultiMC5

2013-02-21 20:40:32 +01:00