diff options
| author | Jack Lloyd <[email protected]> | 2016-08-31 12:58:58 -0400 |
|---|---|---|
| committer | Jack Lloyd <[email protected]> | 2016-08-31 12:58:58 -0400 |
| commit | dfab07a7bc00dc00f98ab86c70d536306073f34f (patch) | |
| tree | d3dbb140764f259c932171d6f229d033dee685ca /doc/license.txt | |
| parent | e29024608fca1b811aa72a7aafd930a42740b968 (diff) | |
| parent | 1b9cf39063194fe91dc8e5d78f73d7251c5d16fc (diff) | |
Merge master into this branch, resolving conflicts with #457/#576
which recently landed on master.
Diffstat (limited to 'doc/license.txt')
| -rw-r--r-- | doc/license.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/doc/license.txt b/doc/license.txt index f292a0d59..88b16651c 100644 --- a/doc/license.txt +++ b/doc/license.txt @@ -29,6 +29,8 @@ Copyright (C) 1999-2013,2014,2015,2016 Jack Lloyd 2015,2016 Daniel Neus 2015 Uri Blumenthal 2015,2016 Kai Michaelis + 2016 Simon Cogliani + 2015,2016 Rohde & Schwarz Cybersecurity 2016 Juraj Somorovsky 2016 Christian Mainka All rights reserved. |