Feel like doing that merge Max?

On Sat, Nov 28, 2015 at 9:08 PM, ikj1234i@yahoo.com [op25-dev] < op25-dev@yahoogroups.com> wrote:

Greetings

It looks like the balint256 'op25' repo tracks the op25 repo at op25.osmocom.org only up to commit 2051a96198c.

The op25.osmocom.org repo has more than a dozen additional commits beyond that, which means that the balint256 op25 install is approx. one year out of date. All of balint's changes don't affect the op25_repeater, so there shouldn't be a big hassle when the time comes to merge everything into master. It looks only like one or two CMakeLists.txt files might have merge conflicts, YMMV.

Accordingly, I recommend as follows (until such time as the merge may happen)

• use only the op25.osmocom.org build when running scope.py
• use only the balint256 one with balint's associated changes
• keep them otherwise separate

Max

ps. Knuckle Punch to Balint!!