| commit | 7e4c74c75ac9f14611317f0802da598e5603d237 | |
| author | Oli Larkin <olilarkin@googlemail.com> | |
| Fri, 4 Aug 2017 10:51:01 +0000 (4 11:51 +0100) | ||
| committer | Oli Larkin <olilarkin@googlemail.com> | |
| Fri, 4 Aug 2017 10:51:01 +0000 (4 11:51 +0100) | ||
| tree | 131a285ce7306198b06d629ddcb59abbcc3999be | treesnapshot (tar.gz zip) |
| parent | 8af9bcc98f968d173da0870e8591c18814374ae1 | commitdiff |
| parent | f56e93b31bbd2f283091c0cde397fa8a9f1cbd5f | commitdiff |
Merge branch 'master' of www-dev.cockos.com/wdl/WDL into next
# Conflicts:
# WDL/lice/test/Controller.mm
# WDL/lice/test/imgs2gif.cpp
# WDL/lice/test/main.cpp
# Conflicts:
# WDL/lice/test/Controller.mm
# WDL/lice/test/imgs2gif.cpp
# WDL/lice/test/main.cpp
| WDL/swell/swell-functions.h | diff1 | diff2 | blobhistory |
| WDL/swell/swell-gdi.mm | diff1 | diff2 | blobhistory |
| WDL/swell/swell-internal.h | diff1 | diff2 | blobhistory |
| WDL/swell/swell-types.h | diff1 | diff2 | blobhistory |