MultiMC5/gui
Petr Mrázek 30b1f5e5cf Merge branch 'feature/fix_intel' into develop
Conflicts:
	CMakeLists.txt
	changelog.yaml
	gui/MainWindow.cpp
2014-06-28 08:49:18 +02:00
..
dialogs Replace notes dialog with a page. 2014-06-18 01:15:01 +02:00
groupview Reorganize logic code. 2014-06-09 01:38:30 +02:00
pagedialog Add close button to page dialog. Add help button to page dialog. 2014-06-10 00:46:05 +02:00
pages Replace notes dialog with a page. 2014-06-18 01:15:01 +02:00
widgets Tweaks to page dialog and version page. 2014-06-09 01:38:31 +02:00
ConsoleWindow.cpp Screenshot upload dialog(s) now have the console window as parent. 2014-05-18 19:07:01 +02:00
ConsoleWindow.h Screenshot upload dialog(s) now have the console window as parent. 2014-05-18 19:07:01 +02:00
ConsoleWindow.ui Deleting screenshots. Needs fixing. 2014-02-24 17:40:05 -05:00
MainWindow.cpp Merge branch 'feature/fix_intel' into develop 2014-06-28 08:49:18 +02:00
MainWindow.h Move instance settings back to the main window. 2014-06-09 01:38:30 +02:00
MainWindow.ui Move instance settings back to the main window. 2014-06-09 01:38:30 +02:00
Platform_Other.cpp
Platform_X11.cpp
Platform.h