Commit Graph

5 Commits

Author SHA1 Message Date
Daniel Willmann 742a86d746 Merge commit 'eca7186eaa09df1870cd9d96017ddc385cffb68f' into dora 2017-06-02 15:01:47 +02:00
Holger Hans Peter Freyther 6dfbeb8cea Merge commit '8073a33e2cb0bbf3aa7ac14808e4cedebb0c20f4' into dora 2015-05-13 12:16:35 +02:00
Holger Hans Peter Freyther 1772239406 Add 'meta-qt5/' from commit '5cd79448e4b5a730922c0c63161a5b2ee5f0b344'
git-subtree-dir: meta-qt5
git-subtree-mainline: 97ae37a446
git-subtree-split: 5cd79448e4
2014-07-30 17:26:11 +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 95144ba7b2 Merge remote-tracking branch 'meta-qt5/master' into dora 2014-03-28 11:46:43 +01:00