Files
lmms/plugins
Tobias Doerffel 53f12a58bf Merge branch 'master' of ssh://zynaddsubfx.git.sourceforge.net/gitroot/zynaddsubfx/zynaddsubfx
Conflicts:
	ChangeLog
(cherry picked from commit 93bb99e57561c5b72d2074a233c513e9da6bf9d4)

Conflicts:

	src/Synth/OscilGen.cpp
	src/Synth/OscilGen.h
	src/main.cpp
2009-09-25 01:17:40 +02:00
..
2009-08-24 17:59:28 +02:00
2009-08-24 17:59:28 +02:00
2009-04-30 00:12:49 +02:00