mia/Aegisub
1
0
Fork 1
Code Issues Pull requests Projects Releases Wiki Activity

Merge r3951 from 2.1.8 back in: fixing old URLs

Browse source 
Originally committed to SVN as r3952.
This commit is contained in:
Niels Martin Hansen 2010-01-06 05:23:58 +00:00
parent dbc885fdb0
commit f805ec707e
3 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
aegisub/src/ass_file.cpp
View file

@ -147,7 +147,7 @@ void AssFile::Load (const wxString _filename,const wxString charset,bool addToRe
// Add comments and set vars // Add comments and set vars
AddComment(_T("Script generated by Aegisub ") + GetAegisubLongVersionString()); AddComment(_T("Script generated by Aegisub ") + GetAegisubLongVersionString());
AddComment(_T("http://www.aegisub.net")); AddComment(_T("http://www.aegisub.org/"));
SetScriptInfo(_T("ScriptType"),_T("v4.00+")); SetScriptInfo(_T("ScriptType"),_T("v4.00+"));
// Add to recent // Add to recent

4
aegisub/src/frame_main_events.cpp
View file

@ -631,7 +631,7 @@ void FrameMain::OnFiles(wxCommandEvent& WXUNUSED(event)) {
/// @param event /// @param event
/// ///
void FrameMain::OnWebsite(wxCommandEvent& WXUNUSED(event)) { void FrameMain::OnWebsite(wxCommandEvent& WXUNUSED(event)) {
AegisubApp::OpenURL(_T("http://www.aegisub.net/")); AegisubApp::OpenURL(_T("http://www.aegisub.org/"));
} }
@ -640,7 +640,7 @@ void FrameMain::OnWebsite(wxCommandEvent& WXUNUSED(event)) {
/// @param event /// @param event
/// ///
void FrameMain::OnForums(wxCommandEvent& WXUNUSED(event)) { void FrameMain::OnForums(wxCommandEvent& WXUNUSED(event)) {
AegisubApp::OpenURL(_T("http://forum.aegisub.net/")); AegisubApp::OpenURL(_T("http://forum.aegisub.org/"));
} }

3
aegisub/src/subtitle_format.cpp
View file

@ -503,8 +503,9 @@ static void InsertLineSortedIntoList(std::list<AssEntry*> &list, std::list<AssEn
} }
/// @brief http://malakith.net/aegiwiki/Split-merge_algorithm_for_converting_to_simple_subtitle_formats Split and merge lines so there are no overlapping lines /// @brief Split and merge lines so there are no overlapping lines
/// ///
/// Algorithm described at http://devel.aegisub.org/wiki/Technical/SplitMerge
void SubtitleFormat::RecombineOverlaps() { void SubtitleFormat::RecombineOverlaps() {
using std::list; using std::list;
list<AssEntry*>::iterator next; list<AssEntry*>::iterator next;