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

..

apputils.h

…

cmdutils.h

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

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

inifile.h

…

libutil_config.h

…

osutils.h

…

pathutils.h

…

siglist_impl.h

More GCC fixes

2013-02-21 19:59:34 +01:00

siglist.h

Fixed MSVC issues.

2013-02-21 12:42:16 -06:00

userutils.h

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

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