Commit Graph

2 Commits

Author SHA1 Message Date
Harald Welte 48a5cd9c10 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.
2017-06-14 11:57:22 +02:00
Holger Hans Peter Freyther 8b10631c40 Add script to merge layers again 2014-07-30 17:27:28 +02:00