?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: ca072dd cd3193e)
Merge remote-tracking branch 'cockos/master' into tmp
commit6ab200d321492093efafc64b4b77541bd427db7d
authorOli Larkin <olilarkin@googlemail.com>
Tue, 13 Jan 2015 10:09:00 +0000 (13 10:09 +0000)
committerOli Larkin <olilarkin@googlemail.com>
Tue, 13 Jan 2015 10:09:00 +0000 (13 10:09 +0000)
tree801607e5040b92ef62289510acb062781ba5ac1atree | snapshot (tar.gz zip)
parentca072ddf69eb9ab33d85a0f7508d0a4b27be6baccommit | diff
parentcd3193e1a9e47caa9088bf13fb74f5f8c3d9ced3commit | diff
Merge remote-tracking branch 'cockos/master' into tmp

Conflicts:
WDL/convoengine.h
WDL/denormal.h
WDL/lice/lice.dsw
WDL/lice/lice.vcxproj
WDL/lice/lice_text.h
WDL/lice/makedist.bat
WDL/lice/test/Controller.h
WDL/lice/test/Controller.mm
WDL/lice/test/fly.cpp
WDL/lice/test/imgs2gif.cpp
WDL/lice/test/main.cpp
WDL/lice/test/main.m
WDL/lice/test/resource.h
WDL/lice/test/test.dsp
WDL/mutex.h
WDL/plush2/plush2.dsp
WDL/swell/sample_project/app_main.cpp
WDL/swell/sample_project/main.h
WDL/swell/sample_project/resource.h
WDL/swell/sample_project/sample_project.dsp
WDL/swell/sample_project/sample_project.dsw
WDL/swell/swell-functions.h
WDL/swell/swell-internal.h
WDL/swell/swell-types.h
WDL/convoengine.h diff1 |  diff2 |  blob | history
WDL/denormal.h diff1 |  diff2 |  blob | history
WDL/lice/lice_text.h diff1 |  diff2 |  blob | history
WDL/lice/test/test.sln blob1 |  blob2 |  history
WDL/lice/test/test.vcxproj blob1 |  blob2 |  history
WDL/lice/test/test.vcxproj.filters blob1 |  blob2 |  history
WDL/mutex.h diff1 |  diff2 |  blob | history
WDL/swell/swell-functions.h diff1 |  diff2 |  blob | history
WDL/swell/swell-types.h diff1 |  diff2 |  blob | history
Enhanced version of Cockos' IPlug - A simple-to-use C++ framework for developing cross platform audio plugins and targeting multiple plugin APIs with the same code. VST / VST3 / Audiounit / RTAS / AAX (Native) formats supported. (git mirror)