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

Merge branch 'stable-1.1'

Browse Source 
Conflicts:
	src/gui/FileBrowser.cpp
This commit is contained in:
Vesa
2014-09-09 23:55:39 +03:00
parent c2d7cf787e 5bbd79de0f
commit bf6659fbb1
17 changed files with 538 additions and 202 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/TrackContainerView.cpp
View File

@@ -36,7 +36,7 @@
#include "bb_track.h"
#include "MainWindow.h"
#include "debug.h"
#include "file_browser.h"
#include "FileBrowser.h"
#include "ImportFilter.h"
#include "Instrument.h"
#include "InstrumentTrack.h"
@@ -340,7 +340,7 @@ void TrackContainerView::dropEvent( QDropEvent * _de )
track::create( track::InstrumentTrack,
m_tc ) );
Instrument * i = it->loadInstrument(
engine::pluginFileHandling()[fileItem::extension(
engine::pluginFileHandling()[FileItem::extension(
value )]);
i->loadFile( value );
//it->toggledInstrumentTrackButton( true );