Commit Graph

9 Commits

Author SHA1 Message Date
Daniel Willmann af8cb4980a Merge commit '3b2076a5563a27e114b02a1e41cf4f62330e9575' into dora 2017-06-02 15:01:41 +02:00
Neels Hofmeyr f882d0a98b Merge commit '8cf5a67850adf270bc2fdb4c0ed708b0ba037670' into dora 2016-12-06 15:35:02 +01:00
Harald Welte 4e69783333 Merge commit 'aa458a136ebd4abc55d502984b5c90ddab458288' into dora
This brings in libtalloc for the sdk
2016-02-23 13:39:43 +01:00
Holger Hans Peter Freyther bd81eeb08c Merge commit 'a715416731955e0454fc88d439709c94afb4b1af' into dora 2015-12-26 19:03:22 +01:00
Holger Hans Peter Freyther 4760757960 Merge commit '07c37e9902a278779a0312b4ac2b2437424ec38d' into dora 2014-11-09 14:40:36 +01:00
Holger Hans Peter Freyther e9781837fd Merge commit '84edb39d87f0b13ae27c92a3fe8635a3051d26a5' into dora 2014-09-24 17:29:02 +02:00
Holger Hans Peter Freyther 91638a2adc Add 'meta-telephony/' from commit '023ca5da04c53ef93ce7c933c2d362ad901ad45e'
git-subtree-dir: meta-telephony
git-subtree-mainline: 5720f60a7e
git-subtree-split: 023ca5da04
2014-07-30 17:25:32 +02:00
Holger Hans Peter Freyther 1994264eba misc: Remove layers merged with subtree merges
Subtree merges are horrible broken and subtree is now back and we can
start using it.
2014-07-30 17:22:38 +02:00
Holger Hans Peter Freyther 8ac87f34cf Merge remote-tracking branch 'meta-telephony/master' into dora 2014-03-28 11:42:01 +01:00