<pre style='margin:0'>
Michael Dickens (michaelld) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/74ada70737adda1df57cbbfdbb3b1562ec34d525">https://github.com/macports/macports-ports/commit/74ada70737adda1df57cbbfdbb3b1562ec34d525</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 74ada70 various: rev-bump for updated Volk ABI
</span>74ada70 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 74ada70737adda1df57cbbfdbb3b1562ec34d525
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Wed Mar 25 11:57:42 2020 -0400
<span style='display:block; white-space:pre;color:#404040;'> various: rev-bump for updated Volk ABI
</span>---
science/gnss-sdr/Portfile | 4 ++--
science/gnuradio/Portfile | 6 +++---
science/gr-adapt/Portfile | 2 +-
science/gr-ais/Portfile | 2 +-
science/gr-baz/Portfile | 2 +-
science/gr-dvbt/Portfile | 2 +-
science/gr-foo/Portfile | 2 +-
science/gr-gfdm/Portfile | 2 +-
science/gr-gsm/Portfile | 2 +-
science/gr-ieee802-15-4/Portfile | 2 +-
science/gr-iio/Portfile | 2 +-
science/gr-lora/Portfile | 4 ++--
science/gr-ofdm/Portfile | 2 +-
science/gr-osmosdr/Portfile | 4 ++--
science/gr-satellites/Portfile | 2 +-
science/luaradio/Portfile | 1 +
science/volk-gnss-sdr/Portfile | 4 ++--
17 files changed, 23 insertions(+), 22 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gnss-sdr/Portfile b/science/gnss-sdr/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 619f4ea..97d0a23 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gnss-sdr/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gnss-sdr/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -39,7 +39,7 @@ if {${subport} eq "gnss-sdr"} {
</span> checksums rmd160 1b3a38340c00632cc49ace1fb7fa326d95a20ca8 \
sha256 3de8a4b6939be9bf4f25ffd9aa52cc5b92dbbbd454184e54cd1b9290c132f5f1 \
size 3766952
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 1
</span>
conflicts gnss-sdr-devel
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -57,7 +57,7 @@ subport gnss-sdr-devel {
</span> checksums rmd160 f3d25bf1cb24959aa1ea8e6c8a8e8fe6d3e0826f \
sha256 bcaebca379be91c89b3a42e40f65ecc052457b59e335d8075d3618127fca3355 \
size 3766992
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 1
</span>
conflicts gnss-sdr
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gnuradio/Portfile b/science/gnuradio/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index a139031..c79612b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gnuradio/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gnuradio/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,7 +26,7 @@ if {${subport} eq ${name}} {
</span> checksums rmd160 6a7f38601633658632cf13a8dc157bbb1e9fcad7 \
sha256 f0c1fb0bbec673a798efdbdad27d4a1b914ef1fd77528642f1e2134920156335 \
size 4434061
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 5
</span>
long_description ${description}: \
This port is kept up with the GNU Radio release, currently ${version}, which is typically updated every few months.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -54,7 +54,7 @@ subport gnuradio-devel {
</span>
github.setup gnuradio gnuradio 896d1c9da31963ecf5b0d90942c2af51ca998a69
version 20180824
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 8
</span> checksums rmd160 8ad7fccef7e21ea96356253432f5f13ad61660ed \
sha256 51080fad6f776f8aec1a6c557320c6c64b4c3c3fde3615ca4d43802de65f324f \
size 4425148
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -82,7 +82,7 @@ subport gnuradio-next {
</span> checksums rmd160 3f27981c0fbc2abf197fb59f7054b774676d47f5 \
sha256 101cd40bd9765ba2a2264f44600b8a7088740a136e7c5457b783c8e87626da3b \
size 3369676
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 3
</span>
# set the version override string
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gr-adapt/Portfile b/science/gr-adapt/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 098554b..38ebf5d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gr-adapt/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gr-adapt/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -17,7 +17,7 @@ version 20191021-[string range ${github.version} 0 7]
</span> checksums rmd160 86f39d385400bbe039d0ebbdf46adfe7ecd172f0 \
sha256 4d6efa41c6192d15a7880b99f4f058dc4b2dcf23aeaf0a863bb5d968b9a1f5d1 \
size 477236
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span>
# use C++11
compiler.cxx_standard 2011
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gr-ais/Portfile b/science/gr-ais/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 2a3f426..4cba0c5 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gr-ais/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gr-ais/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,9 +6,9 @@ PortGroup github 1.0
</span>
github.setup bistromath gr-ais 1863d1bf8a7709a8dfedb3ddb8e2b99112e7c872
version 20151220
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 9
</span> checksums rmd160 98ad4781960817c53576cd823a6d9806824f1f14 \
sha256 e62755e674d5c7b306fb9a22ed0ab88a69fb46dbc179bc80a4dcff3c7fc826b7
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 10
</span>
# allow gr-ais to work with both gnuradio and gnuradio-devel ...
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gr-baz/Portfile b/science/gr-baz/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index f484635..32ba1f1 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gr-baz/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gr-baz/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7,10 +7,10 @@ PortGroup cxx11 1.1
</span>
github.setup balint256 gr-baz 3cedf4bc261e01043daab66c70321889df4f701d
version 20181012
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 5
</span> checksums rmd160 71a8dfad14f9f31c8ac7c27173e445d8f34192d1 \
sha256 17dfc144267a2f53e7ae0fc67c708287b9d5b02390d5934509daf0c642253be6 \
size 511866
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 6
</span>
# allow gr-baz to work with both gnuradio and gnuradio-devel ...
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gr-dvbt/Portfile b/science/gr-dvbt/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index e09e0a4..0160e89 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gr-dvbt/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gr-dvbt/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,9 +9,9 @@ PortGroup cxx11 1.1
</span>
github.setup BogdanDIA gr-dvbt 79e1c54ef3bd66906c2d94dbc383c35c17b3f088
version 20160503
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 7
</span> checksums rmd160 308f7f404a522e6ffe566f3274c41311c524e552 \
sha256 64442cf857d8ea1fe525c30d19f83e31dbf2230fd2768b5a9fa85fa6d0acfcfd
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 8
</span>
categories science comms
maintainers {michaelld @michaelld} openmaintainer
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gr-foo/Portfile b/science/gr-foo/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 3f6a055..5ca4a96 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gr-foo/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gr-foo/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8,10 +8,10 @@ PortGroup cxx11 1.1
</span>
github.setup bastibl gr-foo db2f9ff59fe7a75f420af286e022a250c95efcb3
version 20180621
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 5
</span> checksums rmd160 61264bda25d29f2621949f67f5aac4584ddb8bec \
sha256 ee72fad5a53ecfbbed59d03cb1e92d09043884abe13c91850203d38fce40c359 \
size 107414
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 6
</span>
# allow gr-foo to work with both gnuradio and gnuradio-devel ...
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gr-gfdm/Portfile b/science/gr-gfdm/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 411ac8a..6ffd403 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gr-gfdm/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gr-gfdm/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,10 +6,10 @@ PortGroup github 1.0
</span>
github.setup kit-cel gr-gfdm f9b70a2b3f6761db16a6a1c19feb2a121e11a40a
version 20180318
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 4
</span> checksums rmd160 22f3da4c994253a74ff3fdcbb182ff48992435b1 \
sha256 9f8560fa8ebbe4fbf6a9bdb96ecde41fa1c0a236d1a6e5c744d7c5dd5490070b \
size 248905
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 5
</span>
# allow gr-gsm to work with both gnuradio and gnuradio-devel ...
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gr-gsm/Portfile b/science/gr-gsm/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 8977d49..6ab9121 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gr-gsm/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gr-gsm/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,7 +9,7 @@ version 20180812
</span> checksums rmd160 76289afc52c484bdb1a4a60a18b6cb85f2a4ba3d \
sha256 d628af9a27130a89458efd9f91056457e97f01a66ee5809455f0c95607033d41 \
size 413183
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 4
</span>
# overload the github livecheck branch.
# when master is more advanced, comment this out.
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gr-ieee802-15-4/Portfile b/science/gr-ieee802-15-4/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index a178995..67f2186 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gr-ieee802-15-4/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gr-ieee802-15-4/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -11,7 +11,7 @@ version 20190411-[string range ${github.version} 0 7]
</span> checksums rmd160 0373422cf2c9ed37d8ff583f307593220229ab30 \
sha256 acd75f6894c2a23355cd72b548cf158ff78a43fa3b6c6a8d985f8b133ae62761 \
size 195280
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 3
</span>
# allow gr-ieee802-15-4 to work with both gnuradio and gnuradio-devel ...
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gr-iio/Portfile b/science/gr-iio/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index db11722..3ae23b4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gr-iio/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gr-iio/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,7 +9,7 @@ version 20190725-[string range ${github.version} 0 7]
</span> checksums rmd160 15848e397eff6bd8782cf3927795cd51cf730794 \
sha256 0bcb973ba406bbf5149765b974e36137ffc515457f2e86e8cade389a334fc5d7 \
size 68707
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 3
</span>
# allow gr-iio to work with both gnuradio and gnuradio-devel ...
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gr-lora/Portfile b/science/gr-lora/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index c07464a..20b72f9 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gr-lora/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gr-lora/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19,7 +19,7 @@ subport gr-lora-BastilleResearch {
</span>
github.setup BastilleResearch gr-lora d587169a9676ad0f9ebf85e6a840f3955b3976d7
version 20170713
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 8
</span> checksums rmd160 99f82eb4e57eb59c863598b6a5e58f3632edc769 \
sha256 e1958cfe15e5ff3542e4df3dc7e626751321957cd2ff0122723d6a86d845cf6c
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -34,7 +34,7 @@ subport gr-lora-rpp0 {
</span> checksums rmd160 f5fbd363efebe98a1bdbbd0259c6294ad7ea62e1 \
sha256 37caf0b2550608a31e71dc0f4f605aa2c57fa2cbeaac82984910f5d874efcc6a \
size 519697
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 4
</span>
conflicts gr-lora-BastilleResearch
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gr-ofdm/Portfile b/science/gr-ofdm/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 39f0aa3..66de788 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gr-ofdm/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gr-ofdm/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8,7 +8,7 @@ PortGroup cxx11 1.1
</span>
github.setup rwth-ti gr-ofdm a40720c708b75ad4c12ff09e49931879e9f90e78
version 20180306
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 12
</span> checksums rmd160 ee1f3054e00e57986fa7536d9691018c69e9e68a \
sha256 b053745b3590f1842a35c9914b344db295c2a479ce65711cc3112dc848427e7b \
size 3257234
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gr-osmosdr/Portfile b/science/gr-osmosdr/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index a5a68f8..7046fe3 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gr-osmosdr/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gr-osmosdr/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -17,7 +17,7 @@ if {${name} eq ${subport}} {
</span>
github.setup osmocom gr-osmosdr 4d83c6067f059b0c5015c3f59f8117bbd361e877
version 20170704
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 10
</span> checksums rmd160 7be1f9f0663066ffdb04f7f3378aef007b6c00d9 \
sha256 77eb39c4f19f27fac9e3029a01030b9a64168e15adcda7ad3ad9a7b0ecbfdd00 \
size 278330
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,7 +31,7 @@ if {${name} eq ${subport}} {
</span> # just GR 3.8 version
github.setup osmocom gr-osmosdr 4d83c6067f059b0c5015c3f59f8117bbd361e877
version 20170704
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 10
</span> checksums rmd160 7be1f9f0663066ffdb04f7f3378aef007b6c00d9 \
sha256 77eb39c4f19f27fac9e3029a01030b9a64168e15adcda7ad3ad9a7b0ecbfdd00 \
size 278330
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gr-satellites/Portfile b/science/gr-satellites/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index feb900b..fbf0116 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gr-satellites/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gr-satellites/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15,7 +15,7 @@ github.setup daniestevez gr-satellites 1.8.2 v
</span> checksums rmd160 114873c096906910769783ee2c6a6b0d1114ca55 \
sha256 0915a29cca1daed9f4640448024bc9b14e086ff941253f9b1fc31eda183c5c77 \
size 760064
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span>
# use C++11
compiler.cxx_standard 2011
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/luaradio/Portfile b/science/luaradio/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 2b2c17b..a3c5aba 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/luaradio/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/luaradio/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8,6 +8,7 @@ github.setup vsergeev luaradio 0.6.1 v
</span> checksums rmd160 7bc5090eb17111719a819460ecefffdea79fe20e \
sha256 8f5e539d84d70717a7bf18cce2dc2416bcfbed3a561d869ff66af47c049705a6 \
size 9187436
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span>
categories science comms
platforms darwin
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/volk-gnss-sdr/Portfile b/science/volk-gnss-sdr/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 86f01fa..d6f324b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/volk-gnss-sdr/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/volk-gnss-sdr/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -36,7 +36,7 @@ if {${subport} eq "volk-gnss-sdr"} {
</span> This port is kept up with the VOLK-GNSS-SDR release, which is typically updated every few months.
github.setup gnss-sdr gnss-sdr 0.0.12 v
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 1
</span> checksums rmd160 1b3a38340c00632cc49ace1fb7fa326d95a20ca8 \
sha256 3de8a4b6939be9bf4f25ffd9aa52cc5b92dbbbd454184e54cd1b9290c132f5f1 \
size 3766952
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -56,7 +56,7 @@ subport volk-gnss-sdr-devel {
</span> checksums rmd160 f3d25bf1cb24959aa1ea8e6c8a8e8fe6d3e0826f \
sha256 bcaebca379be91c89b3a42e40f65ecc052457b59e335d8075d3618127fca3355 \
size 3766992
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 1
</span>
conflicts volk-gnss-sdr
</pre><pre style='margin:0'>
</pre>