Merge branch 'master' of https://github.com/huderlem/porymap into slam

include/ui/customscriptseditor.h

@@ -49,6 +49,7 @@ private:
     void restoreWindowState();
     void initShortcuts();
     QObjectList shortcutableObjects() const;
+    void openManual();
 
 private slots:
     void dialogButtonClicked(QAbstractButton *button);

include/ui/projectsettingseditor.h

@@ -65,6 +65,8 @@ private:
     void updateMaskOverlapWarning(QLabel * warning, QList<UIntSpinBox*> masks);
     QStringList getWarpBehaviorsList();
     void setWarpBehaviorsList(QStringList list);
+    void openFilesHelp();
+    void openIdentifiersHelp();
 
 private slots:
     void dialogButtonClicked(QAbstractButton *button);