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

Merge branch 'stable-1.2'

Browse Source 
# Conflicts:
#	cmake/nsis/CMakeLists.txt
#	src/core/ProjectRenderer.cpp
#	src/tracks/Pattern.cpp
This commit is contained in:
Hyunjin Song
2018-10-29 16:20:58 +09:00
parent 4babbe25c5 d8fb07ff52
commit 4252f755c2
76 changed files with 989 additions and 3528 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/MainWindow.cpp
View File

@@ -266,7 +266,7 @@ MainWindow::~MainWindow()
void MainWindow::finalize()
{
resetWindowTitle();
setWindowIcon( embed::getIconPixmap( "icon" ) );
setWindowIcon( embed::getIconPixmap( "icon_small" ) );
// project-popup-menu
@@ -414,7 +414,7 @@ void MainWindow::finalize()
#if !(defined(LMMS_BUILD_APPLE) && (QT_VERSION < 0x050600))
help_menu->addSeparator();
#endif
help_menu->addAction( embed::getIconPixmap( "icon" ), tr( "About" ),
help_menu->addAction( embed::getIconPixmap( "icon_small" ), tr( "About" ),
this, SLOT( aboutLMMS() ) );
// create tool-buttons