Petr Mrázek e241c3625c Merge branch 'feature_theme_support' into develop ...

Conflicts:
	main.cpp

2014-06-30 22:22:09 +02:00

..

AboutDialog.cpp

…

AboutDialog.h

…

AboutDialog.ui

…

AccountListDialog.cpp

…

AccountListDialog.h

…

AccountListDialog.ui

…

AccountSelectDialog.cpp

…

AccountSelectDialog.h

…

AccountSelectDialog.ui

…

CopyInstanceDialog.cpp

Reorganize logic code.

2014-06-09 01:38:30 +02:00

CopyInstanceDialog.h

…

CopyInstanceDialog.ui

…

CustomMessageBox.cpp

…

CustomMessageBox.h

…

EditAccountDialog.cpp

…

EditAccountDialog.h

…

EditAccountDialog.ui

…

IconPickerDialog.cpp

…

IconPickerDialog.h

…

IconPickerDialog.ui

…

LoginDialog.cpp

…

LoginDialog.h

…

LoginDialog.ui

…

LwjglSelectDialog.cpp

Reorganize logic code.

2014-06-09 01:38:30 +02:00

LwjglSelectDialog.h

…

LwjglSelectDialog.ui

…

ModEditDialogCommon.cpp

Add back legacy mod edit, add checksums for all legacy jars

2014-06-09 01:38:30 +02:00

ModEditDialogCommon.h

Add back legacy mod edit, add checksums for all legacy jars

2014-06-09 01:38:30 +02:00

NewInstanceDialog.cpp

All of the broken legacy things work.

2014-06-09 01:38:30 +02:00

NewInstanceDialog.h

All of the broken legacy things work.

2014-06-09 01:38:30 +02:00

NewInstanceDialog.ui

…

NotificationDialog.cpp

…

NotificationDialog.h

…

NotificationDialog.ui

…

ProgressDialog.cpp

…

ProgressDialog.h

…

ProgressDialog.ui

…

SettingsDialog.cpp

Merge branch 'feature_theme_support' into develop

2014-06-30 22:22:09 +02:00

SettingsDialog.h

Reorganize logic code.

2014-06-09 01:38:30 +02:00

SettingsDialog.ui

New flat icon themes from pexner

2014-05-25 04:01:38 +02:00

UpdateDialog.cpp

…

UpdateDialog.h

…

UpdateDialog.ui

…

VersionSelectDialog.cpp

Reorganize logic code.

2014-06-09 01:38:30 +02:00

VersionSelectDialog.h

…

VersionSelectDialog.ui

…