Commit Graph

8 Commits

Author SHA1 Message Date
Daniel Willmann af8cb4980a Merge commit '3b2076a5563a27e114b02a1e41cf4f62330e9575' into dora 2017-06-02 15:01:41 +02:00
Holger Hans Peter Freyther 94adaf9c2d Merge commit '7b41ee80ec30db8d218ce900bf0df5d2333e42c1' into dora 2015-06-26 13:39:17 +02:00
Holger Hans Peter Freyther bec08f4417 Merge commit '80b3fe86f67516c6297a6c6a18db87a7b43e69f0' into dora 2015-02-12 14:29:56 +01:00
Holger Hans Peter Freyther f93bec1bf8 Merge commit 'f244a25089098d0728bdf899f7109deaeac19853' into dora 2014-12-26 17:07:59 +01:00
Holger Hans Peter Freyther 0cca6ebca0 Merge commit '65238f85305f3179491e5e4be8152ea35454ac84' into dora 2014-10-07 17:01:37 +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