Merge branch 'stable-1.2'

# Conflicts:
#	.mailmap
#	cmake/linux/lmms.desktop
#	src/gui/editors/PianoRoll.cpp
#	src/tracks/BBTrack.cpp
This commit is contained in:
Hyunjin Song
2019-09-15 21:08:33 +09:00
37 changed files with 25 additions and 9 deletions

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@@ -81,6 +81,12 @@ TextFloat {
}
/* splash screen text */
QSplashScreen QLabel {
color: white;
}
QMenu {
border-top: 2px solid #08993E;
background-color: #15191c;