Commit Graph

2 Commits

Author SHA1 Message Date
Holger Hans Peter Freyther f59fe37872 Merge commit '49ca632e9af816b65cd1b0f885fc8c3f4af4cdec' into edison
Conflicts:
	meta-sysmocom-bsp/recipes-sysmobts/osmo-bts/osmo-bts_git.bb
	meta-sysmocom-bsp/recipes-sysmobts/osmo-pcu/osmo-pcu_git.bb
2013-05-27 17:48:04 +02:00
Holger Hans Peter Freyther 89df7559e5 Merge commit '5b6ad0ce9dd1e35091d4114381cff51dee953195' into edison 2013-03-12 14:17:17 +01:00