1
0
mirror of https://github.com/moparisthebest/Simba synced 2024-11-22 01:02:17 -05:00

Fix merge gone wrong. ;)

This commit is contained in:
Merlijn Wajer 2010-07-31 15:04:10 +02:00
parent b1f6726627
commit f94e3f50e9

View File

@ -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);
@ -3150,4 +3149,5 @@ initialization
{$R *.lfm} {$R *.lfm}
end. end.