Commit Graph

9 Commits

Author SHA1 Message Date
Holger Hans Peter Freyther bd81eeb08c Merge commit 'a715416731955e0454fc88d439709c94afb4b1af' into dora 2015-12-26 19:03:22 +01:00
Holger Hans Peter Freyther 94adaf9c2d Merge commit '7b41ee80ec30db8d218ce900bf0df5d2333e42c1' into dora 2015-06-26 13:39:17 +02:00
Holger Hans Peter Freyther 1440b3f6ef Merge commit 'f44fee44be75a06deb85248b6e82c21a52bf34a7' into dora 2015-04-10 15:30:40 +02:00
Holger Hans Peter Freyther 706374154e Merge commit '873ae51925a67a267f42301140387ce5b854f66f' into dora 2014-12-30 12:11:52 +01:00
Holger Hans Peter Freyther 0cca6ebca0 Merge commit '65238f85305f3179491e5e4be8152ea35454ac84' into dora 2014-10-07 17:01:37 +02:00
Holger Hans Peter Freyther 4d46da53ac Merge commit 'd9a5b19a0a420270b31c5f90afc6ede38340ab29' into dora 2014-08-25 08:39:41 +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