Petr Mrázek 1936bd181f Merge branch 'feature_derpstances' of https://github.com/02JanDal/MultiMC5 into feature_derpstances ...

Conflicts:
	gui/dialogs/OneSixModEditDialog.cpp
	logic/OneSixUpdate.cpp

2014-02-01 19:37:16 +01:00

..

AboutDialog.cpp

…

AboutDialog.h

…

AboutDialog.ui

…

AccountListDialog.cpp

…

AccountListDialog.h

…

AccountListDialog.ui

…

AccountSelectDialog.cpp

…

AccountSelectDialog.h

…

AccountSelectDialog.ui

…

CopyInstanceDialog.cpp

…

CopyInstanceDialog.h

…

CopyInstanceDialog.ui

…

CustomMessageBox.cpp

…

CustomMessageBox.h

…

EditAccountDialog.cpp

…

EditAccountDialog.h

…

EditAccountDialog.ui

…

EditNotesDialog.cpp

…

EditNotesDialog.h

…

EditNotesDialog.ui

…

IconPickerDialog.cpp

…

IconPickerDialog.h

…

IconPickerDialog.ui

…

InstanceSettings.cpp

…

InstanceSettings.h

…

InstanceSettings.ui

…

LegacyModEditDialog.cpp

…

LegacyModEditDialog.h

…

LegacyModEditDialog.ui

…

LwjglSelectDialog.cpp

…

LwjglSelectDialog.h

…

LwjglSelectDialog.ui

…

ModEditDialogCommon.cpp

…

ModEditDialogCommon.h

…

NewInstanceDialog.cpp

…

NewInstanceDialog.h

…

NewInstanceDialog.ui

…

OneSixModEditDialog.cpp

Merge branch 'feature_derpstances' of https://github.com/02JanDal/MultiMC5 into feature_derpstances

2014-02-01 19:37:16 +01:00

OneSixModEditDialog.h

Change the OneSix library view. It now shows a list of patches.

2014-02-01 14:52:21 +01:00

OneSixModEditDialog.ui

Change the OneSix library view. It now shows a list of patches.

2014-02-01 14:52:21 +01:00

ProgressDialog.cpp

…

ProgressDialog.h

…

ProgressDialog.ui

…

SettingsDialog.cpp

…

SettingsDialog.h

…

SettingsDialog.ui

…

UpdateDialog.cpp

…

UpdateDialog.h

…

UpdateDialog.ui

…

VersionSelectDialog.cpp

Add 'empty text' to all the version selection dialogs.

2014-01-29 01:20:19 +01:00

VersionSelectDialog.h

Add 'empty text' to all the version selection dialogs.

2014-01-29 01:20:19 +01:00

VersionSelectDialog.ui

Add 'empty text' to all the version selection dialogs.

2014-01-29 01:20:19 +01:00