From 48a5cd9c10488d8e555b5f6e5dc45992414ca198 Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Wed, 14 Jun 2017 11:57:22 +0200 Subject: [PATCH] update merge-all to use 201310 branch It doesn't make sense to try to support too many different OE versions like dora and krogoth from one branch. Also, the sysmocom 201310 and 201705 will use different versions of the osmcoom programs lile osmo-bts. Hence, we introduce a 201310 legacy branch which we merge into this repository (which has maintenance updates for 201310 only), rather than trying to follow master of those upstream meta-layers. --- merge-all.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/merge-all.sh b/merge-all.sh index 469602d4d7..bc8235290a 100755 --- a/merge-all.sh +++ b/merge-all.sh @@ -2,7 +2,7 @@ merge() { - git subtree pull --prefix=$1 rem-$1 master + git subtree pull --prefix=$1 rem-$1 201310 } merge meta-telephony