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
26#include <OffscreenUi.h>26#include <OffscreenUi.h>
27 27
28 28
29ModelPropertiesDialog::ModelPropertiesDialog(FSTReader::ModelType modelType, const QVariantHash& originalMapping,29ModelPropertiesDialog::ModelPropertiesDialog(const QVariantHash& originalMapping,
30 const QString& basePath, const HFMModel& hfmModel) :30 const QString& basePath, const HFMModel& hfmModel) :
31_originalMapping(originalMapping),31_originalMapping(originalMapping),
32_basePath(basePath),32_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