Pieter van der Kloet ee27e3bb58 Merge remote-tracking branch 'upstream/next' into settingsnext ... Conflicts: apps/launcher/CMakeLists.txt apps/launcher/datafilespage.cpp apps/launcher/datafilespage.hpp apps/launcher/graphicspage.cpp components/fileorderlist/utils/filedialog.cpp components/fileorderlist/utils/filedialog.hpp		2013-02-15 15:21:14 +01:00
..
comboboxlineedit.cpp	Forgot to add two files	2013-02-14 11:20:47 +01:00
comboboxlineedit.hpp	Forgot to add two files	2013-02-14 11:20:47 +01:00
profilescombobox.cpp	Mainwindow size and position now gets saved/restored	2013-02-15 14:12:25 +01:00
profilescombobox.hpp	WIP: working on improving the config file handling	2013-02-11 15:01:00 +01:00
textinputdialog.cpp	Merge remote-tracking branch 'upstream/next' into settingsnext	2013-02-15 15:21:14 +01:00
textinputdialog.hpp	Split launcher specific code from DataFilesList back to DataFilesPage.	2013-02-04 22:14:14 +01:00