mirror of
https://github.com/moparisthebest/Simba
synced 2024-11-25 10:42:20 -05:00
Fix merge gone wrong. ;)
This commit is contained in:
parent
b1f6726627
commit
f94e3f50e9
@ -45,7 +45,7 @@ uses
|
|||||||
stringutil,mufasatypesutil,mufasabase, v_ideCodeParser,
|
stringutil,mufasatypesutil,mufasabase, v_ideCodeParser,
|
||||||
about, framefunctionlist, ocr, updateform, Simbasettings, psextension, virtualextension,
|
about, framefunctionlist, ocr, updateform, Simbasettings, psextension, virtualextension,
|
||||||
extensionmanager, settingssandbox, v_ideCodeInsight, CastaliaPasLexTypes,
|
extensionmanager, settingssandbox, v_ideCodeInsight, CastaliaPasLexTypes,
|
||||||
CastaliaSimplePasPar, v_AutoCompleteForm, PSDump, settings_usergui2;
|
CastaliaSimplePasPar, v_AutoCompleteForm, PSDump, settings;
|
||||||
|
|
||||||
const
|
const
|
||||||
SimbaVersion = 706;
|
SimbaVersion = 706;
|
||||||
@ -2445,13 +2445,12 @@ end;
|
|||||||
|
|
||||||
procedure TSimbaForm.MenuItemReportBugClick(Sender: TObject);
|
procedure TSimbaForm.MenuItemReportBugClick(Sender: TObject);
|
||||||
begin
|
begin
|
||||||
OpenURL('http://mufasa.villavu.com/mantis/bug_report_page.php');
|
OpenURL('http://bugs.villavu.com/mantis/bug_report_page.php');
|
||||||
end;
|
end;
|
||||||
|
|
||||||
procedure TSimbaForm.MenuItemSettingsButtonClick(Sender: TObject);
|
procedure TSimbaForm.MenuItemSettingsButtonClick(Sender: TObject);
|
||||||
begin
|
begin
|
||||||
//SettingsForm.ShowModal;
|
SettingsForm.ShowModal;
|
||||||
SettingsGUIForm.ShowModal;
|
|
||||||
end;
|
end;
|
||||||
|
|
||||||
procedure TSimbaForm.MenuItemShowClick(Sender: TObject);
|
procedure TSimbaForm.MenuItemShowClick(Sender: TObject);
|
||||||
@ -3151,3 +3150,4 @@ initialization
|
|||||||
|
|
||||||
|
|
||||||
end.
|
end.
|
||||||
|
|
Loading…
Reference in New Issue
Block a user