Orochimarufan e4f86893a8 fix merge issues, make console window work again

2013-03-22 14:40:55 +01:00

..

basicsettingsobject.cpp

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

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

inifile.cpp

Massive re-organization.

2013-02-26 16:47:39 -06:00

inisettingsobject.cpp

Added instance setting overrides.

2013-02-25 16:36:27 -06:00

keyring.cpp

refactor indendation, fix a bug in MinecraftProcess & fix a bug in

2013-03-22 13:56:57 +01:00

overridesetting.cpp

Added instance setting overrides.

2013-02-25 16:36:27 -06:00

setting.cpp

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

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

settingsobject.cpp

Fixed a lot of MSVC problems

2013-02-25 14:44:36 -06:00

stubkeyring.cpp

refactor indendation, fix a bug in MinecraftProcess & fix a bug in

2013-03-22 13:56:57 +01:00

stubkeyring.h

fix merge issues, make console window work again

2013-03-22 14:40:55 +01:00