Andrew 23474da175 Merge branch 'master' of git://github.com/peterix/MultiMC5 ...

Conflicts:
	CMakeLists.txt
	main.cpp

2013-02-25 13:31:37 -06:00

..

plugin

…

appsettings.cpp

Rewrote the settings system. It may still need some work.

2013-02-25 13:24:46 -06:00

appsettings.h

Rewrote the settings system. It may still need some work.

2013-02-25 13:24:46 -06:00

loginresponse.cpp

Rewrote the settings system. It may still need some work.

2013-02-25 13:24:46 -06:00

loginresponse.h

Rewrote the settings system. It may still need some work.

2013-02-25 13:24:46 -06:00

minecraftprocess.cpp

…

minecraftprocess.h

…

userinfo.cpp

Rewrote the settings system. It may still need some work.

2013-02-25 13:24:46 -06:00

userinfo.h

Rewrote the settings system. It may still need some work.

2013-02-25 13:24:46 -06:00

version.cpp

…

version.h

Rewrote the settings system. It may still need some work.

2013-02-25 13:24:46 -06:00