trying to undo the death of default branch

Docs/Changelog_sm-ssc.txt

@@ -16,6 +16,7 @@ sm-ssc v1.2.1 | 20110???
 20110110
 --------
 * [Character] Added GetDisplayName Lua binding. [freem]
+* Make sure that DELAYS come first if STOPS share the same beat. [Wolfman2000]
 
 20110109
 --------

src/TimingData.h

@@ -54,7 +54,11 @@ struct StopSegment
 		return true;
 	}
 	bool operator!=( const StopSegment &other ) const { return !operator==(other); }
-	bool operator<( const StopSegment &other ) const { return m_iStartRow < other.m_iStartRow; }
+	bool operator<( const StopSegment &other ) const
+	{
+		return	( m_iStartRow < other.m_iStartRow ) ||
+		( m_iStartRow == other.m_iStartRow && m_bDelay );
+	}
 };
 
 /* This only supports simple time signatures. The upper number (called the numerator here, though this isn't