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

Merge remote-tracking branch 'origin/stable-1.1'

Browse Source 
Conflicts:
	data/locale/zh.ts
	src/tracks/Pattern.cpp
This commit is contained in:
Tobias Doerffel
2014-09-30 22:53:24 +02:00
parent 606879421b 0055fe13b1
commit f2876ea650
55 changed files with 183 additions and 178 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/SamplePlayHandle.cpp
View File

@@ -27,7 +27,7 @@
#include "bb_track.h"
#include "engine.h"
#include "InstrumentTrack.h"
#include "pattern.h"
#include "Pattern.h"
#include "SampleBuffer.h"
#include "SampleTrack.h"