1
0
Fork 0

Merge commit 'refs/merge-requests/9' of git://gitorious.org/fg/flightgear into integration/merge9

Conflicts:
	src/GUI/new_gui.cxx
This commit is contained in:
James Turner 2010-10-25 09:12:21 +01:00
commit e5abcb1d4e

View file

@ -266,9 +266,6 @@ NewGUI::readDir (const SGPath& path)
continue;
}
string name = nameprop->getStringValue();
if (_dialog_props[name])
delete (SGPropertyNode *)_dialog_props[name];
_dialog_props[name] = props;
}
}