Commit Graph

6 Commits

Author SHA1 Message Date
Neels Hofmeyr f882d0a98b Merge commit '8cf5a67850adf270bc2fdb4c0ed708b0ba037670' into dora 2016-12-06 15:35:02 +01:00
Holger Hans Peter Freyther c0a4618671 Merge commit 'bef17822a767b74449baf7cf69e7cb09e7f0ebd1' into dora 2014-11-18 09:42:54 +01:00
Holger Hans Peter Freyther 4cb109a0d5 Merge commit 'b28405e6a0706fe560bb29efc2691df9e22d092b' into dora 2014-10-07 17:04:33 +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