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

..

aboutdialog.cpp

…

aboutdialog.h

…

aboutdialog.ui

…

browserdialog.cpp

…

browserdialog.h

…

browserdialog.ui

…

consolewindow.cpp

fix merge issues, make console window work again

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

consolewindow.h

fix merge issues, make console window work again

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

consolewindow.ui

…

iconcache.cpp

Add SVG icon rendering/cache

2013-03-20 07:59:35 +01:00

iconcache.h

Add SVG icon rendering/cache

2013-03-20 07:59:35 +01:00

instancedelegate.cpp

Added background cat. Proof of concept :3

2013-03-19 03:20:49 +01:00

instancedelegate.h

Instance view, model, delegate.

2013-03-11 22:19:17 +01:00

instancemodel.cpp

Add SVG icon rendering/cache

2013-03-20 07:59:35 +01:00

instancemodel.h

Property change propagation, changing instance groups, icon preview

2013-03-19 06:24:34 +01:00

logindialog.cpp

Use Keyring in the login dialog

2013-03-26 17:43:49 +01:00

logindialog.h

Use Keyring in the login dialog

2013-03-26 17:43:49 +01:00

logindialog.ui

Use Keyring in the login dialog

2013-03-26 17:43:49 +01:00

mainwindow.cpp

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

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

mainwindow.h

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

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

mainwindow.ui

Instance view, model, delegate.

2013-03-11 22:19:17 +01:00

modeditwindow.cpp

…

modeditwindow.h

…

modeditwindow.ui

…

newinstancedialog.cpp

…

newinstancedialog.h

…

newinstancedialog.ui

…

settingsdialog.cpp

…

settingsdialog.h

…

settingsdialog.ui

Fix settings dialog java tab layout

2013-03-24 18:38:58 +01:00

taskdialog.cpp

…

taskdialog.h

…

taskdialog.ui

…

versionselectdialog.cpp

Implemented version lists.

2013-03-28 11:33:31 -05:00

versionselectdialog.h

Implemented version lists.

2013-03-28 11:33:31 -05:00

versionselectdialog.ui

Implemented version lists.

2013-03-28 11:33:31 -05:00