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:
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -81,6 +81,12 @@ TextFloat {
|
||||
}
|
||||
|
||||
|
||||
/* splash screen text */
|
||||
QSplashScreen QLabel {
|
||||
color: white;
|
||||
}
|
||||
|
||||
|
||||
QMenu {
|
||||
border-top: 2px solid #08993E;
|
||||
background-color: #15191c;
|
||||
|
||||
Reference in New Issue
Block a user