Merge remote-tracking branch 'origin/next' into TaranisPlus
Conflicts: companion/src/generaledit.cpp companion/src/generaledit.ui radio/src/gui/menu_general.cpp
This commit is contained in:
@@ -131,6 +131,7 @@ private slots:
|
||||
void unlockSwitchEdited();
|
||||
void setValues();
|
||||
void shrink();
|
||||
void stickReverseEdited();
|
||||
};
|
||||
|
||||
#endif // GENERALEDIT_H
|
||||
|
||||
Reference in New Issue
Block a user