Merge pull request #1026 from LMMS/stable-1.1

Browse Source

sync

...

This commit is contained in:

Vesa V

2014-07-26 00:31:03 +03:00

parent 953ea983be 925d29934d

commit 1934879109

722 changed files with 149696 additions and 16 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

BIN

data/presets/ZynAddSubFX/Arpeggios/0068-Glass Arpeggio1.xiz Normal file

Binary file not shown.

BIN

data/presets/ZynAddSubFX/Arpeggios/0069-Glass Arpeggio2.xiz Normal file

Binary file not shown.

BIN

data/presets/ZynAddSubFX/Brass/0067-Brass Pad1.xiz Normal file

Binary file not shown.

BIN

data/presets/ZynAddSubFX/Brass/0068-Brass Pad2.xiz Normal file

Binary file not shown.

0

data/presets/ZynAddSubFX/Collections/WillGodfrey/0001-Xylophone.xiz → data/presets/ZynAddSubFX/Collection/0001-Xylophone.xiz

0

data/presets/ZynAddSubFX/Collections/WillGodfrey/0002-Vibraphone.xiz → data/presets/ZynAddSubFX/Collection/0002-Vibraphone.xiz

0

data/presets/ZynAddSubFX/Collections/WillGodfrey/0003-Soft Vibes.xiz → data/presets/ZynAddSubFX/Collection/0003-Soft Vibes.xiz

0

data/presets/ZynAddSubFX/Collections/WillGodfrey/0004-Simple Chimes.xiz → data/presets/ZynAddSubFX/Collection/0004-Simple Chimes.xiz

0

data/presets/ZynAddSubFX/Collections/WillGodfrey/0005-Silver Bell.xiz → data/presets/ZynAddSubFX/Collection/0005-Silver Bell.xiz

BIN

data/presets/ZynAddSubFX/Collection/0006-Soft Hammer.xiz Normal file

Binary file not shown.

BIN

data/presets/ZynAddSubFX/Collection/0007-Ethereal.xiz Normal file

Binary file not shown.

BIN

data/presets/ZynAddSubFX/Collection/0008-Metal Drips.xiz Normal file

Binary file not shown.

BIN

data/presets/ZynAddSubFX/Collection/0009-Trem Lead.xiz Normal file

Binary file not shown.

0

data/presets/ZynAddSubFX/Collections/WillGodfrey/0012-Trem Synth Piano 3.xiz → data/presets/ZynAddSubFX/Collection/0010-Trem Synth Piano 3.xiz

0

data/presets/ZynAddSubFX/Collections/WillGodfrey/0033-Trem Synth.xiz → data/presets/ZynAddSubFX/Collection/0011-Trem Synth.xiz

BIN

data/presets/ZynAddSubFX/Collection/0012-Simple Square.xiz Normal file

Binary file not shown.

BIN

data/presets/ZynAddSubFX/Collection/0013-Full Square.xiz Normal file

Binary file not shown.

BIN

data/presets/ZynAddSubFX/Collection/0014-Super Square.xiz Normal file

Binary file not shown.

0

data/presets/ZynAddSubFX/Collections/WillGodfrey/0018-Steel Wire.xiz → data/presets/ZynAddSubFX/Collection/0015-Steel Wire.xiz

BIN

data/presets/ZynAddSubFX/Collection/0016-Echo Bubbles.xiz Normal file

Binary file not shown.

BIN

data/presets/ZynAddSubFX/Collection/0017-Fantasia.xiz Normal file

Binary file not shown.

BIN

data/presets/ZynAddSubFX/Collection/0018-Sub Delay.xiz Normal file

Binary file not shown.

BIN

data/presets/ZynAddSubFX/Collection/0019-Soft.xiz Normal file

Binary file not shown.

BIN

data/presets/ZynAddSubFX/Collection/0020-Ultra Soft.xiz Normal file

Binary file not shown.

BIN

data/presets/ZynAddSubFX/Collection/0021-Whistle.xiz Normal file

Binary file not shown.

BIN

data/presets/ZynAddSubFX/Collection/0022-Wipe Whistle.xiz Normal file

Binary file not shown.

BIN

data/presets/ZynAddSubFX/Collection/0023-Ghost Whistle.xiz Normal file

Binary file not shown.

0

data/presets/ZynAddSubFX/Collections/WillGodfrey/0029-Full Strings.xiz → data/presets/ZynAddSubFX/Collection/0024-Full Strings.xiz

0

data/presets/ZynAddSubFX/Collections/WillGodfrey/0030-Slow Strings.xiz → data/presets/ZynAddSubFX/Collection/0025-Slow Strings.xiz

0

data/presets/ZynAddSubFX/Collections/WillGodfrey/0032-Pizzicato Strings.xiz → data/presets/ZynAddSubFX/Collection/0026-Pizzicato Strings.xiz

BIN

data/presets/ZynAddSubFX/Collection/0027-Sweep Synth.xiz Normal file

Binary file not shown.

0

data/presets/ZynAddSubFX/Collections/WillGodfrey/0034-Warm Synth.xiz → data/presets/ZynAddSubFX/Collection/0028-Warm Synth.xiz

0

data/presets/ZynAddSubFX/Collections/WillGodfrey/0035-Hard Synth.xiz → data/presets/ZynAddSubFX/Collection/0029-Hard Synth.xiz

BIN

data/presets/ZynAddSubFX/Collection/0030-Bright Synth.xiz Normal file

Binary file not shown.

0

data/presets/ZynAddSubFX/Collections/WillGodfrey/0037-Multi Synth.xiz → data/presets/ZynAddSubFX/Collection/0031-Multi Synth.xiz

0

data/presets/ZynAddSubFX/Collections/WillGodfrey/0038-Slow Saw.xiz → data/presets/ZynAddSubFX/Collection/0032-Slow Saw.xiz

0

data/presets/ZynAddSubFX/Collections/WillGodfrey/0039-Medium Saw.xiz → data/presets/ZynAddSubFX/Collection/0033-Medium Saw.xiz

0

data/presets/ZynAddSubFX/Collections/WillGodfrey/0040-Hard Saw.xiz → data/presets/ZynAddSubFX/Collection/0034-Hard Saw.xiz

0

data/presets/ZynAddSubFX/Collections/WillGodfrey/0041-Voiced Saw.xiz → data/presets/ZynAddSubFX/Collection/0035-Voiced Saw.xiz

BIN

data/presets/ZynAddSubFX/Collection/0036-Sweep Saw.xiz Normal file

Binary file not shown.

BIN

data/presets/ZynAddSubFX/Collection/0037-Stereo Sweep Saw.xiz Normal file

Binary file not shown.

0

data/presets/ZynAddSubFX/Collections/WillGodfrey/0044-Wipe Synth.xiz → data/presets/ZynAddSubFX/Collection/0038-Wipe Synth.xiz

0

data/presets/ZynAddSubFX/Collections/WillGodfrey/0045-Hard Stereo Sweep Synth.xiz → data/presets/ZynAddSubFX/Collection/0039-Hard Stereo Sweep Synth.xiz

BIN

data/presets/ZynAddSubFX/Collection/0040-Master Synth Low.xiz Normal file

Binary file not shown.

BIN

data/presets/ZynAddSubFX/Collection/0041-Master Synth High.xiz Normal file

Binary file not shown.

0

data/presets/ZynAddSubFX/Collections/WillGodfrey/0048-Sharp Synth.xiz → data/presets/ZynAddSubFX/Collection/0042-Sharp Synth.xiz

0

data/presets/ZynAddSubFX/Collections/WillGodfrey/0050-Fretless Bass.xiz → data/presets/ZynAddSubFX/Collection/0043-Fretless Bass.xiz

0

data/presets/ZynAddSubFX/Collections/WillGodfrey/0051-Decay Bass.xiz → data/presets/ZynAddSubFX/Collection/0044-Decay Bass.xiz

0

data/presets/ZynAddSubFX/Collections/WillGodfrey/0052-Steel Bass.xiz → data/presets/ZynAddSubFX/Collection/0045-Steel Bass.xiz

0

data/presets/ZynAddSubFX/Collections/WillGodfrey/0053-Synth Bass.xiz → data/presets/ZynAddSubFX/Collection/0046-Synth Bass.xiz

BIN

data/presets/ZynAddSubFX/Collection/0047-Distorted Bass.xiz Normal file

Binary file not shown.

BIN

data/presets/ZynAddSubFX/Collection/0048-Variable Reed.xiz Normal file

Binary file not shown.

BIN

data/presets/ZynAddSubFX/Collection/0049-Reed Organ.xiz Normal file

Binary file not shown.

BIN

data/presets/ZynAddSubFX/Collection/0050-Soft Organ.xiz Normal file

Binary file not shown.

BIN

data/presets/ZynAddSubFX/Collection/0051-Thin Pipe.xiz Normal file

Binary file not shown.

BIN

data/presets/ZynAddSubFX/Collection/0052-Great Organ.xiz Normal file

Binary file not shown.

BIN

data/presets/ZynAddSubFX/Collection/0053-64ft Organ.xiz Normal file

Binary file not shown.

0

data/presets/ZynAddSubFX/Collections/WillGodfrey/0062-Hammond Organ.xiz → data/presets/ZynAddSubFX/Collection/0054-Hammond Organ.xiz

BIN

data/presets/ZynAddSubFX/Collection/0055-Percussion Organ.xiz Normal file

Binary file not shown.

0

data/presets/ZynAddSubFX/Collections/WillGodfrey/0064-Sines.xiz → data/presets/ZynAddSubFX/Collection/0056-Sines.xiz

0

data/presets/ZynAddSubFX/Collections/WillGodfrey/0067-Soft Flute.xiz → data/presets/ZynAddSubFX/Collection/0057-Soft Flute.xiz

0

data/presets/ZynAddSubFX/Collections/WillGodfrey/0068-Warm Flute.xiz → data/presets/ZynAddSubFX/Collection/0058-Warm Flute.xiz

0

data/presets/ZynAddSubFX/Collections/WillGodfrey/0071-Ocarina.xiz → data/presets/ZynAddSubFX/Collection/0059-Ocarina.xiz

BIN

data/presets/ZynAddSubFX/Collection/0060-Beyond.xiz Normal file

Binary file not shown.

BIN

data/presets/ZynAddSubFX/Collection/0061-Sweep Pad.xiz Normal file

Binary file not shown.

BIN

data/presets/ZynAddSubFX/Collection/0062-Sweep Matrix.xiz Normal file

Binary file not shown.

BIN

data/presets/ZynAddSubFX/Collection/0063-Matrix.xiz Normal file

Binary file not shown.

BIN

data/presets/ZynAddSubFX/Collection/0064-Slow Deep Matrix.xiz Normal file

Binary file not shown.

BIN

data/presets/ZynAddSubFX/Collection/0065-Ice Field.xiz Normal file

Binary file not shown.

BIN

data/presets/ZynAddSubFX/Collection/0066-Hollow Ice Field.xiz Normal file

Binary file not shown.

BIN

data/presets/ZynAddSubFX/Collection/0067-Smooth.xiz Normal file

Binary file not shown.

BIN

data/presets/ZynAddSubFX/Collection/0068-Rushes.xiz Normal file

Binary file not shown.

BIN

data/presets/ZynAddSubFX/Collection/0069-Medium Rushes.xiz Normal file

Binary file not shown.

BIN

data/presets/ZynAddSubFX/Collection/0070-Bright Rushes.xiz Normal file

Binary file not shown.

BIN

data/presets/ZynAddSubFX/Collection/0071-Bright Rush Long Tail.xiz Normal file

Binary file not shown.

BIN

data/presets/ZynAddSubFX/Collection/0072-Extended Rushes.xiz Normal file

Binary file not shown.

BIN

data/presets/ZynAddSubFX/Collection/0073-Bright Rush Pipe.xiz Normal file

Binary file not shown.

BIN

data/presets/ZynAddSubFX/Collection/0074-Sweep Rushes.xiz Normal file

Binary file not shown.

BIN

data/presets/ZynAddSubFX/Collection/0075-Breathy Pad.xiz Normal file

Binary file not shown.

BIN

data/presets/ZynAddSubFX/Collection/0076-ReedBank.xiz Normal file

Binary file not shown.

BIN

data/presets/ZynAddSubFX/Collection/0077-Voyager.xiz Normal file

Binary file not shown.

BIN

data/presets/ZynAddSubFX/Collection/0078-Soft Voyager.xiz Normal file

Binary file not shown.

BIN

data/presets/ZynAddSubFX/Collection/0079-Soft Voyager Reverse.xiz Normal file

Binary file not shown.

0

data/presets/ZynAddSubFX/Collections/WillGodfrey/0096-Echo Choir.xiz → data/presets/ZynAddSubFX/Collection/0080-Echo Choir.xiz

BIN

data/presets/ZynAddSubFX/Collection/0081-Sharp.xiz Normal file

Binary file not shown.

BIN

data/presets/ZynAddSubFX/Collection/0082-Sharp and Warm.xiz Normal file

Binary file not shown.

BIN

data/presets/ZynAddSubFX/Collection/0083-Sharp and Deep.xiz Normal file

Binary file not shown.

0

data/presets/ZynAddSubFX/Collections/WillGodfrey/0099-Sharp Reed.xiz → data/presets/ZynAddSubFX/Collection/0084-Sharp Reed.xiz

BIN

data/presets/ZynAddSubFX/Collection/0085-Far Reed.xiz Normal file

Binary file not shown.

0

data/presets/ZynAddSubFX/Collections/WillGodfrey/0103-Clarinet.xiz → data/presets/ZynAddSubFX/Collection/0086-Clarinet.xiz

0

data/presets/ZynAddSubFX/Collections/WillGodfrey/0102-Bassoon.xiz → data/presets/ZynAddSubFX/Collection/0087-Bassoon.xiz

BIN

data/presets/ZynAddSubFX/Collection/0088-Aooww.xiz Normal file

Binary file not shown.

0

data/presets/ZynAddSubFX/Collections/WillGodfrey/0107-Daooww.xiz → data/presets/ZynAddSubFX/Collection/0089-Daooww.xiz

0

data/presets/ZynAddSubFX/Collections/WillGodfrey/0108-Yaooww.xiz → data/presets/ZynAddSubFX/Collection/0090-Yaooww.xiz

0

data/presets/ZynAddSubFX/Collections/WillGodfrey/0109-Yiee.xiz → data/presets/ZynAddSubFX/Collection/0091-Yiee.xiz

0

data/presets/ZynAddSubFX/Collections/WillGodfrey/0110-Eeoow.xiz → data/presets/ZynAddSubFX/Collection/0092-Eeoow.xiz

0

data/presets/ZynAddSubFX/Collections/WillGodfrey/0112-Overdrive.xiz → data/presets/ZynAddSubFX/Collection/0093-Overdrive.xiz

0

data/presets/ZynAddSubFX/Collections/WillGodfrey/0113-Overdrive 2.xiz → data/presets/ZynAddSubFX/Collection/0094-Overdrive 2.xiz

BIN

data/presets/ZynAddSubFX/Collection/0095-Overdrive 3.xiz Normal file

Binary file not shown.

0

data/presets/ZynAddSubFX/Collections/WillGodfrey/0116-Power Guitar 1.xiz → data/presets/ZynAddSubFX/Collection/0096-Power Guitar 1.xiz

Some files were not shown because too many files have changed in this diff Show More