Commit Graph

10 Commits

Author SHA1 Message Date
Holger Hans Peter Freyther 207ab6359d Merge commit '9092529d52b16e271eb8f2e287d4ae6b19a04e7e' into dora 2016-03-23 12:00:36 +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 94a36866e7 Merge commit '87c73f768c84613f07e704026f3b6eff9459cfd0' into dora 2016-01-22 19:20:12 +01:00
Holger Hans Peter Freyther 94adaf9c2d Merge commit '7b41ee80ec30db8d218ce900bf0df5d2333e42c1' into dora 2015-06-26 13:39:17 +02:00
Holger Hans Peter Freyther 4760757960 Merge commit '07c37e9902a278779a0312b4ac2b2437424ec38d' into dora 2014-11-09 14:40:36 +01:00
Holger Hans Peter Freyther 0cca6ebca0 Merge commit '65238f85305f3179491e5e4be8152ea35454ac84' into dora 2014-10-07 17:01:37 +02: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