merge.

I seem to get an EXC_BAD_ACCESS error about libpng on app starting, so I don't know if the merge succeeded at all :<
2011-06-04 19:18:55 +07:00
parent 49042c4878 a8769dc78e
commit 687affa1e5
56 changed files with 1963 additions and 1021 deletions
@@ -287,9 +287,6 @@ public:
 	/** @brief The Song's TimingData. */
 	TimingData m_SongTiming;

-	/** @brief The initial offset of a song. */
-	float	m_fBeat0OffsetInSeconds;
-
 	typedef vector<BackgroundChange> 	VBackgroundChange;
 private:
 	/**