Tobias Doerffel 89dc820d7b Merge remote-tracking branch 'origin/stable-0.4-new-fx-mixer' ...

Conflicts:
	include/PlayHandle.h
	src/core/FxMixer.cpp
	src/core/Mixer.cpp
	src/gui/FxMixerView.cpp
	src/tracks/InstrumentTrack.cpp

2014-03-26 11:21:15 +01:00

..

unrtf

FlpImport/unrtf: renamed malloc.h to ur_malloc.h for not conflicting with system headers

2012-12-02 19:00:06 +01:00

CMakeLists.txt

File and class renames part 1

2009-08-25 01:30:41 +02:00

FlpImport.cpp

Merge remote-tracking branch 'origin/stable-0.4-new-fx-mixer'

2014-03-26 11:21:15 +01:00

FlpImport.h

Replaced [S/U]int[8/16/32] with types from stdint.h or plain integers

2014-01-18 02:56:38 +01:00

unrtf.cpp

FlpImport/unrtf: renamed malloc.h to ur_malloc.h for not conflicting with system headers

2012-12-02 19:00:06 +01:00