Petr Mrázek 18b087e992 Merge https://github.com/Forkk/MultiMC5 ...

Conflicts:
	gui/mainwindow.ui

2013-02-06 07:09:32 +01:00

..

logindialog.cpp

Started working on task system and login system.

2013-02-05 16:34:20 -06:00

logindialog.h

Started working on task system and login system.

2013-02-05 16:34:20 -06:00

logindialog.ui

Started working on task system and login system.

2013-02-05 16:34:20 -06:00

mainwindow.cpp

Implemented login system.

2013-02-05 19:22:19 -06:00

mainwindow.h

Started working on task system and login system.

2013-02-05 16:34:20 -06:00

mainwindow.ui

Merge https://github.com/Forkk/MultiMC5

2013-02-06 07:09:32 +01:00

modeditwindow.cpp

Added mod edit window.

2013-01-15 19:04:10 -06:00

modeditwindow.h

Added mod edit window.

2013-01-15 19:04:10 -06:00

modeditwindow.ui

Added mod edit window.

2013-01-15 19:04:10 -06:00

newinstancedialog.cpp

Added new instance dialog.

2013-02-01 13:07:36 -06:00

newinstancedialog.h

Added new instance dialog.

2013-02-01 13:07:36 -06:00

newinstancedialog.ui

Added new instance dialog.

2013-02-01 13:07:36 -06:00

settingsdialog.cpp

Implemented settings dialog.

2013-01-28 15:35:09 -06:00

settingsdialog.h

Implemented settings dialog.

2013-01-28 15:35:09 -06:00

settingsdialog.ui

Implemented settings dialog.

2013-01-28 15:35:09 -06:00

taskdialog.cpp

Started working on task system and login system.

2013-02-05 16:34:20 -06:00

taskdialog.h

Started working on task system and login system.

2013-02-05 16:34:20 -06:00

taskdialog.ui

Started working on task system and login system.

2013-02-05 16:34:20 -06:00