tree 30699b917f34638f9cea5808ab1c90d810048a8b
parent 6fe77dedaef3e890807db394217a7b645140ba86
parent dff0413a684c70b3de5629d8e959de2101fe6fd5
author John McMaster <mcmaster@google.com> 1518570139 -0800
committer GitHub <noreply@github.com> 1518570139 -0800
gpgsig -----BEGIN PGP SIGNATURE-----
 
 wsBcBAABCAAQBQJag4qbCRBK7hj4Ov3rIwAAdHIIAEHYm4qVb6oba1lJ72jk8p4J
 MvXauPaCXinzEDixzj6rydBcaa4/GJdnK1kmYbg42iUA6OY7GcSdCK7XofU/3iSk
 jW8NPr4a3eWYJvtK2K+Gi119hycBZWywecq1Wp/o+VPXWadrdIVu95FSGcS4fXFE
 LSYRM+4P3OfIa/wD5DQf0gYBZV3rhJuO28QbkZ60sNrqkW37ewX0/jXb5qOpfszt
 g9WPmBeRQ6M2rSAyT9ltdrcpTi9V1VHn8HI6jxiNCZ3GEhSWqei9ps/1v3WztDdo
 W2oG0jXxkwnn6bk7p7IaHptxGSQSYpc4rDHI7zu3IPaaVvZkoPlG+1fCjiWsowY=
 =Gg0j
 -----END PGP SIGNATURE-----
 

Merge pull request #95 from mcmasterg/ndi1mux_slicem

ndi1mux: dont add to slicel