Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2018-03-20 13:12:10 (GMT) |
|---|---|---|
| committer | Tobias Markmann <tm@ayena.de> | 2018-03-20 14:48:04 (GMT) |
| commit | f2c2c7d035029fb9615b42c18ccea83e8e705b10 (patch) | |
| tree | 2f56fb77de0f366528395f21732d418f016f63b5 /COPYING.thirdparty | |
| parent | 44581c5285d13c0ec715b35ddc79177e5ebeef39 (diff) | |
| parent | 5ba3f18ad8efa040d49f36d83ec2e7891a9add9f (diff) | |
| download | swift-f2c2c7d035029fb9615b42c18ccea83e8e705b10.zip swift-f2c2c7d035029fb9615b42c18ccea83e8e705b10.tar.bz2 | |
Merge branch 'swift-4.x'swift-5.0alpha2
* swift-4.x: (44 commits)
Test-Information:
Builds on macOS 10.13.3 with clang trunk.
Change-Id: If50381f103b0ad18d038b920d3d43537642141cb
Diffstat (limited to 'COPYING.thirdparty')
| -rw-r--r-- | COPYING.thirdparty | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/COPYING.thirdparty b/COPYING.thirdparty index 35cad47..082e183 100644 --- a/COPYING.thirdparty +++ b/COPYING.thirdparty @@ -208,16 +208,18 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND --- START OF SIMPLIFIED BSD LICENSE -Copyright (c) 2012 Isode Limited, London, England. -Copyright (c) 2012 Yoann Blein. -Copyright (c) 2012 Mateusz Piekos. -Copyright (c) 2012 Catalin Badea. -Copyright (c) 2012 Maciej Niedzielski. -Copyright (c) 2015 Kim Alvefur. -Copyright (c) 2015 Tarun Gupta. -Copyright (c) 2015 Daniel Baczynski. -Copyright (c) 2015 Michael Vetter. -Copyright (c) 2016 Barun Parruck. +Copyright (c) 2012 Isode Limited, London, England +Copyright (c) 2012 Yoann Blein +Copyright (c) 2012 Mateusz Piekos +Copyright (c) 2012 Catalin Badea +Copyright (c) 2012 Maciej Niedzielski +Copyright (c) 2015 Kim Alvefur +Copyright (c) 2015 Tarun Gupta +Copyright (c) 2015 Daniel Baczynski +Copyright (c) 2015 Michael Vetter +Copyright (c) 2016 Barun Parruck +Copyright (c) 2017 Vitaly Takmazov +Copyright (c) 2017 Dennis Schridde All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: |