mirror/lmms
1
0
Fork 0
mirror of https://github.com/LMMS/lmms.git synced 2026-04-01 21:04:18 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into ed_refac

Browse Source 
Conflicts:
	src/gui/editors/PianoRoll.cpp
This commit is contained in:
Lukas W
2015-01-11 13:25:55 +01:00
parent 23dbe95e80 a52626bb15
commit 56055b36b0
57 changed files with 557 additions and 332 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/MainWindow.cpp
View File

@@ -1235,7 +1235,7 @@ void MainWindow::collectErrors(const QList<QString>* errors )
void MainWindow::collectError( const QString error )
void MainWindow::collectError( const QString & error )
{
m_errors->append( error );
}
@@ -1249,7 +1249,7 @@ void MainWindow::clearErrors()
void MainWindow::showErrors( const QString message )
void MainWindow::showErrors( const QString & message )
{
if ( m_errors->length() != 0 )
{ QString* errors = new QString();