diff options
| author | Andrew Elder <aelder@audioscience.com> | 2015-11-04 13:44:42 -0500 |
|---|---|---|
| committer | Andrew Elder <aelder@audioscience.com> | 2015-11-04 13:44:42 -0500 |
| commit | 7ac8671b932a2a049b2b9320a533a0400e59bb7b (patch) | |
| tree | 9912ac93d9a506965f953696beee2f1b166a617c /travis.sh | |
| parent | d5f1a1aebca76fab5b168be702b3bcb10b6d92bb (diff) | |
| parent | 6ffd6d847c1a2cf9360cba9dd177b129887dd3ab (diff) | |
| download | Open-AVB-7ac8671b932a2a049b2b9320a533a0400e59bb7b.tar.gz | |
Merge branch 'gptp-enhancements' of https://github.com/srinath88/Open-AVB into srinath88-gptp-enhancements
Conflicts:
examples/jackd-talker/jackd_talker.c
examples/simple_talker/simple_talker.c
Diffstat (limited to 'travis.sh')
0 files changed, 0 insertions, 0 deletions