Commit Graph

5 Commits

Author SHA1 Message Date
Petr Mrázek
18b087e992 Merge https://github.com/Forkk/MultiMC5
Conflicts:
	gui/mainwindow.ui
2013-02-06 07:09:32 +01:00
Petr Mrázek
4e9006769e Some minor changes in the instance model and control 2013-02-06 07:07:44 +01:00
Andrew
2d05e90196 Fix naming issue in instance model class. 2013-01-31 16:46:31 -06:00
Andrew
dcc21b7e64 Changed group list loading to use Qt JSON instead of boost. 2013-01-29 13:01:04 -06:00
Petr Mrázek
00893b3cfc Instance model (or at least something like it) 2013-01-22 05:56:12 +01:00