Merge branch 'origin/next'

Conflicts:
	companion/src/mdichild.cpp
This commit is contained in:
Kjell Kernen
2014-03-03 17:54:43 +01:00
56 changed files with 996 additions and 697 deletions
+1 -1
View File
@@ -151,7 +151,7 @@ void MdiChild::checkAndInitModel( int row )
{
ModelData &model = radioData.models[row - 1];
if (model.isempty()) {
model.setDefault(row - 1);
model.setDefaultValues(row - 1, radioData.generalSettings);
setModified();
}
}