Pieter van der Kloet fd430dc5a9 Merge remote-tracking branch 'mike-sc/sel_widget' into settings_selwidget ... Conflicts: apps/launcher/datafilespage.cpp components/fileorderlist/datafileslist.cpp		2013-02-15 15:38:30 +01:00
..
model	Merge remote-tracking branch 'mike-sc/sel_widget' into settings_selwidget	2013-02-15 15:38:30 +01:00
utils	Merge remote-tracking branch 'upstream/next' into settingsnext	2013-02-15 15:21:14 +01:00
datafileslist.cpp	Merge remote-tracking branch 'mike-sc/sel_widget' into settings_selwidget	2013-02-15 15:38:30 +01:00
datafileslist.hpp	Rename mPlugins* to mFiles*	2013-02-10 14:08:54 +01:00