mirror/lmms
1
0
Fork 0
mirror of https://github.com/LMMS/lmms.git synced 2026-04-02 05:16:40 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'stable-1.1' of git@github.com:LMMS/lmms.git

Browse Source 
Conflicts:
	src/gui/MainWindow.cpp
	src/gui/plugin_browser.cpp
This commit is contained in:
Lukas W
2014-11-25 01:01:47 +01:00
parent 9e245f7ca0 e47c1242b8
commit 02cbc89f0f
22 changed files with 872 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/MainWindow.cpp
View File

@@ -94,7 +94,7 @@ MainWindow::MainWindow() :
splitter->setChildrenCollapsible( false );
QString wdir = ConfigManager::inst()->workingDir();
sideBar->appendTab( new pluginBrowser( splitter ) );
sideBar->appendTab( new PluginBrowser( splitter ) );
sideBar->appendTab( new FileBrowser(
ConfigManager::inst()->userProjectsDir() + "*" +
ConfigManager::inst()->factoryProjectsDir(),