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

Conflicts:
	CMakeLists.txt
	gui/mainwindow.cpp

2013-03-28 11:37:12 -05:00

..

include

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

2013-03-28 11:37:12 -05:00

src

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

2013-03-28 11:37:12 -05:00

CMakeLists.txt

Massive re-organization.

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