summaryrefslogtreecommitdiffstats
path: root/src/DabMux.cpp
diff options
context:
space:
mode:
authorMatthias P. Braendli <matthias.braendli@mpb.li>2016-11-28 20:17:58 +0100
committerMatthias P. Braendli <matthias.braendli@mpb.li>2016-11-28 20:17:58 +0100
commitac6fff2d6d514c4b4d72088114c1f2e42c5968cd (patch)
treec6e7607b5090ceff1e69a1f0fff206b1a7a9c07b /src/DabMux.cpp
parentfedab89cd4625617b3e481f1f59ba0fc97b7305b (diff)
parent6800fb66282525542366bc58df3095b93e3bf8ca (diff)
downloaddabmux-ac6fff2d6d514c4b4d72088114c1f2e42c5968cd.tar.gz
dabmux-ac6fff2d6d514c4b4d72088114c1f2e42c5968cd.tar.bz2
dabmux-ac6fff2d6d514c4b4d72088114c1f2e42c5968cd.zip
Merge branch 'servicelinking' into next
Diffstat (limited to 'src/DabMux.cpp')
-rw-r--r--src/DabMux.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/DabMux.cpp b/src/DabMux.cpp
index 3927420..04d1980 100644
--- a/src/DabMux.cpp
+++ b/src/DabMux.cpp
@@ -7,7 +7,7 @@
Matthias P. Braendli, matthias.braendli@mpb.li
http://www.opendigitalradio.org
- */
+ */
/*
This file is part of ODR-DabMux.