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

..

esm

Upload missing files.

2013-02-02 18:36:01 +01:00

datafilesmodel.cpp

Merge remote-tracking branch 'upstream/next' into settingsnext

2013-02-15 15:21:14 +01:00

datafilesmodel.hpp

Upload missing files.

2013-02-02 18:36:01 +01:00

modelitem.cpp

Upload missing files.

2013-02-02 18:36:01 +01:00

modelitem.hpp

Upload missing files.

2013-02-02 18:36:01 +01:00