Merge branch 'master' of http://www-dev.cockos.com/wdl/WDL
commitbfd8ea3bc69d5f615e71a662db6bc0ad451ce8c6
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
parentb1072fa0b590c839a7c491cee95524f7bbeabf67
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