Commit Graph

8 Commits

Author SHA1 Message Date
Holger Hans Peter Freyther e9781837fd Merge commit '84edb39d87f0b13ae27c92a3fe8635a3051d26a5' into dora 2014-09-24 17:29:02 +02:00
Holger Hans Peter Freyther 33f625756b Merge commit 'fa6475f559b2daacb68c2989aa94cbd55f39b349' into dora 2014-08-25 08:44:18 +02:00
Holger Hans Peter Freyther 4d46da53ac Merge commit 'd9a5b19a0a420270b31c5f90afc6ede38340ab29' into dora 2014-08-25 08:39:41 +02:00
Holger Hans Peter Freyther cf3256fd7c Merge commit '1e73b53323b919bcf171df4df573dcb3d6d546bb' into dora 2014-08-21 17:35:31 +02:00
Holger Hans Peter Freyther 29af1f4b9b Merge commit '1e059eb7d83878c78126be44a56d483c37eccb26' into dora 2014-08-21 13:29:51 +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