Tobias Doerffel 28cf4a5f8d Merge remote-tracking branch 'origin/stable-1.0' ...

Conflicts:
	CMakeLists.txt
	data/CMakeLists.txt
	include/SampleBuffer.h
	plugins/CMakeLists.txt
	plugins/zynaddsubfx/zynaddsubfx/src/Params/PADnoteParameters.cpp
	src/core/SampleBuffer.cpp

2014-05-12 21:57:10 +02: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-1.0'

2014-05-12 21:57:10 +02: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