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:
commit
e5abcb1d4e
1 changed files with 0 additions and 3 deletions
|
@ -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;
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue