Merge branch 'master' of http://www-dev.cockos.com/wdl/WDL
commit3ea9fb1f394ac8ecd5a48533a5b61486942d9a4d
authorOli Larkin <olilarkin@googlemail.com>
Sun, 3 Jan 2016 10:53:45 +0000 (3 10:53 +0000)
committerOli Larkin <olilarkin@googlemail.com>
Sun, 3 Jan 2016 10:53:45 +0000 (3 10:53 +0000)
tree8099878be3d3bd2da07d7077fbadc0b298bcf216
parentfd44af0e806cc82f1106614bb0fcc4bd46aa573a
parent54ead525fbb4d3523713954dde62552a9076455a
Merge branch 'master' of www-dev.cockos.com/wdl/WDL

Conflicts:
WDL/lice/lice_text.h
WDL/swell/swell-dlg.mm
WDL/swell/swell-dlg.mm
WDL/swell/swell-functions.h
WDL/swell/swell-gdi.mm
WDL/swell/swell-internal.h
WDL/swell/swell-misc.mm
WDL/swell/swell-types.h