History

fix merge conflict

humbletim committed 8 years ago

Commit d0e4c621 parent 21030fb1 file · +1 −1Browse files

Showing the changes to interface/src/ModelPropertiesDialog.cpp (1 of 1 file). Show all

Unified · Split

interface/src/ModelPropertiesDialog.cpp+1−1
@@ -26,7 +26,7 @@ · 25 unmodified lines
2626 #include <OffscreenUi.h>
2727
2828
29−ModelPropertiesDialog::ModelPropertiesDialog(FSTReader::ModelType modelType, const QVariantHash& originalMapping,
29+ModelPropertiesDialog::ModelPropertiesDialog(const QVariantHash& originalMapping,
3030 const QString& basePath, const HFMModel& hfmModel) :
3131 _originalMapping(originalMapping),
3232 _basePath(basePath),

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t