Samuel Rødal 92c998afb6 Merge remote branch 'gerrit/master' into refactor ... Conflicts: src/gui/kernel/qapplication_x11.cpp src/gui/widgets/qlinecontrol.cpp src/gui/widgets/qlinecontrol_p.h src/gui/widgets/qtabwidget.h Change-Id: I90ba893a5553b9ff5658ca0a3221ecf76be4c736		2011-08-03 11:03:22 +02:00
..
inifiles	…
locationdialog.cpp	Merge remote branch 'gerrit/master' into refactor	2011-08-03 11:03:22 +02:00
locationdialog.h	…
main.cpp	…
mainwindow.cpp	…
mainwindow.h	…
settingseditor.desktop	…
settingseditor.pro	…
settingstree.cpp	…
settingstree.h	…
variantdelegate.cpp	…
variantdelegate.h	…